Mercurial > pidgin
changeset 18832:140662c8280c
merge of '599ce70692fe573e98628269564b76296451b587'
and 'bbcb8341b26dc1c43b844d99930c771cf6e64246'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Tue, 07 Aug 2007 11:32:56 +0000 |
| parents | d57926990768 (current diff) f8b22b11a126 (diff) |
| children | 510cd9fa91aa 500c785c109d |
| files | |
| diffstat | 5 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/finch.c Tue Aug 07 11:25:22 2007 +0000 +++ b/finch/finch.c Tue Aug 07 11:32:56 2007 +0000 @@ -401,7 +401,9 @@ signal(SIGPIPE, SIG_IGN); g_set_prgname("Finch"); +#if GLIB_CHECK_VERSION(2,2,0) g_set_application_name(_("Finch")); +#endif /* Initialize the libpurple stuff */ if (!init_libpurple(argc, argv))
--- a/pidgin/gtkmain.c Tue Aug 07 11:25:22 2007 +0000 +++ b/pidgin/gtkmain.c Tue Aug 07 11:32:56 2007 +0000 @@ -695,7 +695,9 @@ return 1; } +#if GLIB_CHECK_VERSION(2,2,0) g_set_application_name(_("Pidgin")); +#endif /* glib-2.0 >= 2.2.0 */ #ifdef _WIN32 winpidgin_init(hint);
--- a/pidgin/gtkutils.c Tue Aug 07 11:25:22 2007 +0000 +++ b/pidgin/gtkutils.c Tue Aug 07 11:32:56 2007 +0000 @@ -2047,11 +2047,11 @@ entry.entry.buddy->account, entry.entry.buddy->name ); +#else + item->data = g_strdup(entry.entry.buddy->name); + g_completion_add_items(data->completion, item); +#endif /* NEW_STYLE_COMPLETION */ } -#else - item->data = g_strdup(buddy->name); - g_completion_add_items(data->completion, item); -#endif /* NEW_STYLE_COMPLETION */ } } }
--- a/pidgin/pidginstock.c Tue Aug 07 11:25:22 2007 +0000 +++ b/pidgin/pidginstock.c Tue Aug 07 11:32:56 2007 +0000 @@ -44,7 +44,7 @@ #endif { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, - { PIDGIN_STOCK_CLOSE_TABS, "buttons", "close-tab.png" }, + { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, #if GTK_CHECK_VERSION(2,6,0)
--- a/pidgin/pixmaps/Makefile.am Tue Aug 07 11:25:22 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Tue Aug 07 11:32:56 2007 +0000 @@ -1,7 +1,6 @@ SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray EXTRA_DIST = \ - close-tab.png \ edit.png \ logo.png \ pause.png \ @@ -13,7 +12,7 @@ pidgin.ico pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons -pidginbuttonpix_DATA = edit.png pause.png close-tab.png +pidginbuttonpix_DATA = edit.png pause.png pidgindistpixdir = $(datadir)/pixmaps/pidgin pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm