From 4bae717ddcdc274703988128d17d489eaa3d5fac Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 13 Apr 2010 15:43:49 +0200
Subject: [PATCH] add new icon, and make a bit of cleanup.

---
 configure.in                                  |   1 +
 gtk-glade/Makefile.am                         |   3 +--
 gtk-glade/about.glade                         |  20 +++++++++---------
 gtk-glade/linphone2.png                       | Bin 5485 -> 0 bytes
 gtk-glade/main.c                              |  10 ++++++---
 pixmaps/Makefile.am                           |   5 +++--
 pixmaps/linphone.png                          | Bin 11971 -> 0 bytes
 gtk-glade/linphone.png => pixmaps/oldlogo.png | Bin
 share/Makefile.am                             |   4 +---
 .../{linphone.desktop => linphone.desktop.in} |   2 +-
 share/linphone.gnorba                         |   5 -----
 share/linphone_applet.desktop                 |   9 --------
 12 files changed, 24 insertions(+), 35 deletions(-)
 delete mode 100644 gtk-glade/linphone2.png
 delete mode 100644 pixmaps/linphone.png
 rename gtk-glade/linphone.png => pixmaps/oldlogo.png (100%)
 rename share/{linphone.desktop => linphone.desktop.in} (70%)
 delete mode 100644 share/linphone.gnorba
 delete mode 100644 share/linphone_applet.desktop

diff --git a/configure.in b/configure.in
index 79aac9ebae..fb1ce96c74 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 8af8be66d9..f2086d8231 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 8203b41608..e4ee4d2bb8 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 &lt;darkone@darkone.pl&gt;
 cs: Petr Pisar &lt;petr.pisar@atlas.cz&gt;
 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
GIT binary patch
literal 0
HcmV?d00001

literal 5485
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

diff --git a/gtk-glade/main.c b/gtk-glade/main.c
index e59f4acb84..96dc358b60 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 e09fa9406d..e94ac7eef1 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
GIT binary patch
literal 0
HcmV?d00001

literal 11971
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
V7s<Feo}K^z002ovPDHLkV1kdPDntMP

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 734859945a..57f26a8a19 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 09e1104544..cde170df2b 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 b9e50592bf..0000000000
--- 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 48403271de..0000000000
--- 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
-- 
GitLab