1 # date:2009-08-12 owner:jefftsai type:branding doo:9963

     2 #

     3 # These changes should not be submitted upstream.

     4 

     5 --- pidgin-2.6.0/pidgin/gtkmain.c.orig2	2009-08-19 07:36:41.935460000 +0800

     6 +++ pidgin-2.6.0/pidgin/gtkmain.c	2009-08-19 07:37:42.090824000 +0800

     7 @@ -731,6 +731,10 @@

     8  	gtk_rc_add_default_file(search_path);

     9  	g_free(search_path);

    10  

    11 +#if GLIB_CHECK_VERSION(2,2,0)

    12 +       g_set_application_name(_("Pidgin"));

    13 +#endif /* glib-2.0 >= 2.2.0 */

    14 +

    15  #ifdef  GAIM_ENABLE_KEYRING

    16          GnomeKeyringResult rtn = gnome_keyring_unlock_sync(NULL, NULL);

    17          // if (rtn == GNOME_KEYRING_RESULT_DENIED)