diff --git a/configure.in b/configure.in
index 79aac9ebaeb9a105360f49737aece93381619240..fb1ce96c74e020927c95388ac97b1517e8fb4d65 100644
--- a/configure.in
+++ b/configure.in
@@ -442,6 +442,7 @@ share/it/Makefile
share/ja/Makefile
share/cs/Makefile
share/linphone.pc
+share/linphone.desktop
scripts/Makefile
linphone.spec
linphone.iss
diff --git a/gtk-glade/Makefile.am b/gtk-glade/Makefile.am
index 8af8be66d97dc17be7f148c7d792a2c7e371fdb9..f2086d823116f3ffadbeca9d83936c9672bd95c9 100644
--- a/gtk-glade/Makefile.am
+++ b/gtk-glade/Makefile.am
@@ -11,8 +11,7 @@ GLADE_FILES= about.glade \
buddylookup.glade \
waiting.glade
-PIXMAPS= linphone2.png \
- linphone.png \
+PIXMAPS= \
stock_people.png
LINPHONE_ICO_RC_FILE=linphone.rc
diff --git a/gtk-glade/about.glade b/gtk-glade/about.glade
index 8203b416088be78ce312ca80cbf5e6ed0229ae7a..e4ee4d2bb8730e7f4aeb987b67ba18c4c514222b 100644
--- a/gtk-glade/about.glade
+++ b/gtk-glade/about.glade
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Jun 2 22:01:30 2008 -->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.12 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkAboutDialog" id="about">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">About linphone</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="icon">linphone2.png</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<property name="program_name">Linphone</property>
<property name="version">undef</property>
@@ -32,14 +32,13 @@ pl: Robert Nasiadek <darkone@darkone.pl>
cs: Petr Pisar <petr.pisar@atlas.cz>
hu: anonymous
</property>
- <property name="artists">Icons by Pablo Marcello Moia
-</property>
- <property name="logo">linphone.png</property>
+ <property name="artists">Icons by kerosine.fr</property>
<signal name="response" handler="linphone_gtk_about_response"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox8">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<placeholder/>
@@ -48,11 +47,12 @@ hu: anonymous
<widget class="GtkHButtonBox" id="dialog-action_area7">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
diff --git a/gtk-glade/linphone2.png b/gtk-glade/linphone2.png
deleted file mode 100644
index d1bf1ab63cbbca8c09191a01782d54da0214bed3..0000000000000000000000000000000000000000
Binary files a/gtk-glade/linphone2.png and /dev/null differ
diff --git a/gtk-glade/main.c b/gtk-glade/main.c
index e59f4acb843d07d2bb98848c7cd4f1af1ff84ac7..96dc358b60e9f29564283871969ec393575d8f31 100644
--- a/gtk-glade/main.c
+++ b/gtk-glade/main.c
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <sys/stat.h>
#include <unistd.h>
-#define LINPHONE_ICON "linphone2.png"
+#define LINPHONE_ICON "linphone.png"
const char *this_program_ident_string="linphone_ident_string=" LINPHONE_VERSION;
@@ -235,7 +235,7 @@ static void linphone_gtk_configure_window(GtkWidget *w, const char *window_name)
if (config_loaded==FALSE){
hiddens=linphone_gtk_get_ui_config("hidden_widgets",NULL);
shown=linphone_gtk_get_ui_config("shown_widgets",NULL);
- icon_path=linphone_gtk_get_ui_config("icon",NULL);
+ icon_path=linphone_gtk_get_ui_config("icon",LINPHONE_ICON);
config_loaded=TRUE;
}
if (hiddens)
@@ -352,6 +352,8 @@ void linphone_gtk_show_about(){
struct stat filestat;
const char *license_file=PACKAGE_DATA_DIR "/linphone/COPYING";
GtkWidget *about;
+ GdkPixbuf *logo=create_pixbuf(
+ linphone_gtk_get_ui_config("logo","linphone-banner.png"));
about=linphone_gtk_create_window("about");
gtk_about_dialog_set_url_hook(about_url_clicked,NULL,NULL);
@@ -372,12 +374,14 @@ void linphone_gtk_show_about(){
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about),LINPHONE_VERSION);
gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("title","Linphone"));
gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about),linphone_gtk_get_ui_config("home","http://www.linphone.org"));
+ if (logo) gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about),logo);
+
gtk_widget_show(about);
}
static void set_video_window_decorations(GdkWindow *w){
const char *title=linphone_gtk_get_ui_config("title","Linphone");
- const char *icon_path=linphone_gtk_get_ui_config("icon","linphone2.png");
+ const char *icon_path=linphone_gtk_get_ui_config("icon",LINPHONE_ICON);
char video_title[256];
GdkPixbuf *pbuf=create_pixbuf(icon_path);
if (!linphone_core_in_call(linphone_gtk_get_core())){
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index e09fa9406d60b6627f82f8d031eb3bbbb8a7b733..e94ac7eef1ef39ef1aa96c2af75adfe2d90ba3c4 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -2,13 +2,14 @@
pixmapdir=$(datadir)/pixmaps/linphone
-pixmap_DATA= linphone2.png linphone2.xpm linphone.png \
+pixmap_DATA= linphone2.png linphone2.xpm \
sip-away.png sip-bifm.png \
sip-busy.png sip-closed.png \
sip-online.png sip-otl.png \
sip-otp.png sip-wfa.png \
green.png red.png \
mic_muted.png mic_active.png \
-linphone-3-250x130.png linphone-3.png linphone2-57x57.png
+linphone-3-250x130.png linphone-3.png linphone2-57x57.png \
+linphone.png linphone-banner.png
EXTRA_DIST=$(pixmap_DATA)
diff --git a/pixmaps/linphone.png b/pixmaps/linphone.png
deleted file mode 100644
index 06cf18315e755813a393d246ba1d27d51c0aaaeb..0000000000000000000000000000000000000000
Binary files a/pixmaps/linphone.png and /dev/null differ
diff --git a/gtk-glade/linphone.png b/pixmaps/oldlogo.png
similarity index 100%
rename from gtk-glade/linphone.png
rename to pixmaps/oldlogo.png
diff --git a/share/Makefile.am b/share/Makefile.am
index 734859945af9c5cf6723536c80721806945ef6eb..57f26a8a19cc81ed18333726ec1a209adf29f1ef 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -30,8 +30,6 @@ pkgconfig_DATA=linphone.pc
EXTRA_DIST = $(LINPHONE_SOUNDS) \
$(LINPHONE_RINGS) \
- linphone.gnorba \
- linphone.desktop \
- linphone_applet.desktop \
+ linphone.desktop.in \
linphone.pc.in \
Makefile.inc
diff --git a/share/linphone.desktop b/share/linphone.desktop.in
similarity index 70%
rename from share/linphone.desktop
rename to share/linphone.desktop.in
index 09e1104544ee9ad4c9c794e6dd435d81f582e980..cde170df2bb6810f100f8accf04cbe9510746839 100644
--- a/share/linphone.desktop
+++ b/share/linphone.desktop.in
@@ -5,6 +5,6 @@ Comment[fr]=Linphone est un web-phone.
Comment[de]=Linphone ist ein web-phone.
Type=Application
Exec=linphone-3
-Icon=linphone/linphone2.png
+Icon=@prefix@/share/pixmaps/linphone/linphone.png
Terminal=false
Categories=Application;Network;
\ No newline at end of file
diff --git a/share/linphone.gnorba b/share/linphone.gnorba
deleted file mode 100644
index b9e50592bf7669e6cf14f1013896946ba900fa92..0000000000000000000000000000000000000000
--- a/share/linphone.gnorba
+++ /dev/null
@@ -1,5 +0,0 @@
-[linphone_applet]
-type=exe
-repo_id=IDL:GNOME/Applet:1.0
-description=Linphone is a web phone.
-location_info=linphone --applet
\ No newline at end of file
diff --git a/share/linphone_applet.desktop b/share/linphone_applet.desktop
deleted file mode 100644
index 48403271dedfae3c9a10a8d732e3876c4f03ff55..0000000000000000000000000000000000000000
--- a/share/linphone_applet.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Linphone Applet
-Comment=Linphone is a web-phone
-Comment[fr]=Linphone est un web-phone.
-Comment[de]=Linphone ist ein web-phone.
-Type=Application
-Exec=linphone --applet --activate-goad-server=linphone_applet
-Icon=linphone/linphone2.png
-Terminal=0
\ No newline at end of file