1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
--- pidgin-2.10.10.orig/pidgin/gtkutils.c 2014-10-16 22:19:33.000000000 -0200
+++ pidgin-2.10.10/pidgin/gtkutils.c 2014-10-22 16:16:10.310955981 -0200
@@ -677,7 +677,6 @@
GdkPixbuf *pixbuf = NULL;
GtkSizeGroup *sg;
GList *p;
- const char *gtalk_name = NULL, *facebook_name = NULL;
int i;
aop_menu = g_malloc0(sizeof(AopMenu));
@@ -686,63 +685,12 @@
gtk_widget_show(aop_menu->menu);
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
- if (purple_find_prpl("prpl-jabber")) {
- gtalk_name = _("Google Talk");
- facebook_name = _("Facebook (XMPP)");
- }
-
for (p = purple_plugins_get_protocols(), i = 0;
p != NULL;
p = p->next, i++) {
plugin = (PurplePlugin *)p->data;
- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
- "16", "google-talk.png", NULL);
- GtkWidget *item;
-
- pixbuf = pidgin_pixbuf_new_from_file(filename);
- g_free(filename);
-
- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol"));
- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1));
-
- if (pixbuf)
- g_object_unref(pixbuf);
-
- /* libpurple3 compatibility */
- if (g_strcmp0(default_proto_id, "prpl-gtalk") == 0)
- aop_menu->default_item = i;
-
- gtalk_name = NULL;
- i++;
- }
-
- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) {
- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
- "16", "facebook.png", NULL);
- GtkWidget *item;
-
- pixbuf = pidgin_pixbuf_new_from_file(filename);
- g_free(filename);
-
- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol"));
- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1));
-
- if (pixbuf)
- g_object_unref(pixbuf);
-
- /* libpurple3 compatibility */
- if (g_strcmp0(default_proto_id, "prpl-facebook-xmpp") == 0)
- aop_menu->default_item = i;
-
- facebook_name = NULL;
- i++;
- }
-
pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
|
