Mercurial > pidgin.yaz
changeset 18165:580eeb340cf4
merge of '2bc31508944a5802088a6273899d80859246ce27'
and '313ed1dce594cfffce4bd14adb5e490fb9809ebd'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 17 Jun 2007 16:54:10 +0000 |
| parents | 1100b05e9fb7 (current diff) 428bea8235cb (diff) |
| children | afeb35205669 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/qq/packet_parse.h Sun Jun 17 15:29:02 2007 +0000 +++ b/libpurple/protocols/qq/packet_parse.h Sun Jun 17 16:54:10 2007 +0000 @@ -26,6 +26,7 @@ #define _QQ_PACKED_PARSE_H_ #include <glib.h> +#include <time.h> /* According to "UNIX Network Programming", all TCP/IP implementations * must support a minimum IP datagram size of 576 bytes, regardless of the MTU.
--- a/pidgin/gtkblist.c Sun Jun 17 15:29:02 2007 +0000 +++ b/pidgin/gtkblist.c Sun Jun 17 16:54:10 2007 +0000 @@ -2860,7 +2860,6 @@ { N_("/Buddies/Add C_hat..."), NULL, pidgin_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD }, { N_("/Buddies/Add _Group..."), NULL, purple_blist_request_add_group, 0, "<StockItem>", GTK_STOCK_ADD }, { "/Buddies/sep3", NULL, NULL, 0, "<Separator>", NULL }, - { N_("/Buddies/_About Pidgin"), NULL, pidgin_dialogs_about, 0, "<Item>", NULL }, { N_("/Buddies/_Quit"), "<CTL>Q", purple_core_quit, 0, "<StockItem>", GTK_STOCK_QUIT }, /* Accounts menu */ @@ -2877,7 +2876,6 @@ { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL }, { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<Item>", NULL }, - { N_("/Tools/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL }, { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, { N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, /* Help */
--- a/pidgin/gtkmain.c Sun Jun 17 15:29:02 2007 +0000 +++ b/pidgin/gtkmain.c Sun Jun 17 16:54:10 2007 +0000 @@ -474,7 +474,7 @@ /* This is the first Glib function call. Make sure to initialize GThread bfeore then */ g_thread_init(NULL); - + #ifdef ENABLE_NLS bindtextdomain(PACKAGE, LOCALEDIR); bind_textdomain_codeset(PACKAGE, "UTF-8"); @@ -855,6 +855,7 @@ winpidgin_post_init(); #endif + g_set_application_name(_("Pidgin")); gtk_main(); #ifdef HAVE_SIGNAL_H