diff --git a/images/sflphone.png b/images/sflphone.png new file mode 100644 index 0000000000000000000000000000000000000000..50c1483ac152972fa6d993b6823b5d247dd258bc Binary files /dev/null and b/images/sflphone.png differ diff --git a/sflphone-gtk/pixmaps/Makefile.am b/sflphone-gtk/pixmaps/Makefile.am index 8534c907251c8b5789485dd79aa820b76e4805e6..6bc3b742a3c28c61992dc068cd4d87a60262acfd 100644 --- a/sflphone-gtk/pixmaps/Makefile.am +++ b/sflphone-gtk/pixmaps/Makefile.am @@ -1,6 +1,6 @@ icondir = $(datadir)/pixmaps -icon_DATA = sflphone.png +#icon_DATA = sflphone2.png -buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history.svg history2.svg +buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg incoming.svg outgoing.svg missed.svg mailbox.svg busy.svg icon_accept.svg icon_hold.svg icon_unhold.svg icon_hangup.svg icon_call.svg icon_dialpad.svg icon_volume.svg icon_dialpad_off.svg icon_volume_off.svg history.svg history2.svg sflphone.png buttonsdir = $(datadir)/sflphone EXTRA_DIST = $(icon_DATA) $(buttons_DATA) diff --git a/sflphone-gtk/pixmaps/sflphone.png b/sflphone-gtk/pixmaps/sflphone.png index d40cbdb2a827b91e537d23e4282520e5008f2427..50c1483ac152972fa6d993b6823b5d247dd258bc 100644 Binary files a/sflphone-gtk/pixmaps/sflphone.png and b/sflphone-gtk/pixmaps/sflphone.png differ diff --git a/sflphone-gtk/src/Makefile.am b/sflphone-gtk/src/Makefile.am index 9776ed96acddd016955e74563f1ef020d069dd99..c29656041ae6ab3e1eca397c0a672421e8ebc665 100644 --- a/sflphone-gtk/src/Makefile.am +++ b/sflphone-gtk/src/Makefile.am @@ -30,7 +30,6 @@ sflphone_gtk_LDADD = $(DEPS_LIBS) -lnotify AM_CPPFLAGS = $(DEPS_CFLAGS) \ -DICONS_DIR=\""$(datadir)/sflphone"\" \ - -DICON_DIR=\""$(datadir)/pixmaps"\" \ -DCODECS_DIR=\""$(libdir)/sflphone/codecs"\" # add symbolic link diff --git a/sflphone-gtk/src/assistant.c b/sflphone-gtk/src/assistant.c index 35ae075ed2903e422ace637979674ceafb34a5b0..f32529e4e486a1ec1b6d093e7ebf3030e137ed42 100644 --- a/sflphone-gtk/src/assistant.c +++ b/sflphone-gtk/src/assistant.c @@ -367,7 +367,7 @@ create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section) gtk_assistant_set_page_complete(GTK_ASSISTANT(wiz->assistant), vbox, TRUE); - wiz->logo = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL); + wiz->logo = gdk_pixbuf_new_from_file(ICONS_DIR "/sflphone.png", NULL); gtk_assistant_set_page_header_image(GTK_ASSISTANT(wiz->assistant),vbox, wiz->logo); g_object_unref(wiz->logo); diff --git a/sflphone-gtk/src/sflnotify.c b/sflphone-gtk/src/sflnotify.c index 747c477069d2f276ed14e41c06427ee2966b2081..8d108d485ff44d85ce3d4887fb9e80863ef1833b 100644 --- a/sflphone-gtk/src/sflnotify.c +++ b/sflphone-gtk/src/sflnotify.c @@ -98,7 +98,7 @@ notify_voice_mails( guint count , account_t* acc ) (gchar*) g_hash_table_lookup(acc->properties , ACCOUNT_ALIAS) ) ; body = g_markup_printf_escaped(_("%d voice mails"), count); - pixbuf = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL); + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/sflphone.png", NULL); notification = notify_notification_new( title, body, @@ -133,7 +133,7 @@ notify_current_account( account_t* acc ) title = g_markup_printf_escaped(_("Current account")); - pixbuf = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL); + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/sflphone.png", NULL); notification = notify_notification_new( title, body, @@ -162,7 +162,7 @@ notify_no_accounts( ) title = g_markup_printf_escaped(_("Error")); - pixbuf = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL); + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/sflphone.png", NULL); notification = notify_notification_new( title, body, @@ -199,7 +199,7 @@ notify_no_registered_accounts( ) title = g_markup_printf_escaped(_("Error")); - pixbuf = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL); + pixbuf = gdk_pixbuf_new_from_file(ICONS_DIR "/sflphone.png", NULL); notification = notify_notification_new( title, body,