merge of 'a51a9c1e43148a4509af7b30b7e6100659060b29'

Thu, 28 Jun 2007 14:53:47 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Thu, 28 Jun 2007 14:53:47 +0000
changeset 18396
e5745d95ea41
parent 18345
a51a9c1e4314 (diff)
parent 18395
a47f7cd50b66 (current diff)
child 18397
2148d74e1c6e
child 18398
c46c353e0b51
child 18417
88a1c65eaad3
child 18426
5a65dc89632f

merge of 'a51a9c1e43148a4509af7b30b7e6100659060b29'
and 'a47f7cd50b66069d201ddfd0032b32d2d2b3992f'

--- a/pidgin/gtkmain.c	Thu Jun 28 06:13:28 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Jun 28 14:53:47 2007 +0000
@@ -677,6 +677,8 @@
 		return 1;
 	}
 
+	g_set_application_name(_("Pidgin"));
+
 #ifdef _WIN32
 	winpidgin_init(hint);
 #endif
@@ -855,7 +857,6 @@
 	winpidgin_post_init();
 #endif
 
-	g_set_application_name(_("Pidgin"));
 	gtk_main();
 
 #ifdef HAVE_SIGNAL_H

mercurial