author | Rich Burridge <rich.burridge@oracle.com> |
Mon, 16 Nov 2015 16:48:46 -0800 | |
changeset 5091 | 81e5d6b75c3c |
permissions | -rw-r--r-- |
5091
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# date:2009-08-12 owner:jefftsai type:branding doo:9963 |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
# These changes should not be submitted upstream. |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- pidgin-2.6.0/pidgin/gtkmain.c.orig2 2009-08-19 07:36:41.935460000 +0800 |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ pidgin-2.6.0/pidgin/gtkmain.c 2009-08-19 07:37:42.090824000 +0800 |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -731,6 +731,10 @@ |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
gtk_rc_add_default_file(search_path); |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
g_free(search_path); |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
+#if GLIB_CHECK_VERSION(2,2,0) |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+ g_set_application_name(_("Pidgin")); |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+#endif /* glib-2.0 >= 2.2.0 */ |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
+ |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
#ifdef GAIM_ENABLE_KEYRING |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
GnomeKeyringResult rtn = gnome_keyring_unlock_sync(NULL, NULL); |
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
// if (rtn == GNOME_KEYRING_RESULT_DENIED) |