Mercurial > pidgin
diff pidgin/gtkutils.c @ 32700:b961222cf067
Remove UI hack for XMPP sub-prpls.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Wed, 28 Dec 2011 09:00:48 +0000 |
parents | 763d65f3f758 |
children | b8a6a07aa5b0 |
line wrap: on
line diff
--- a/pidgin/gtkutils.c Wed Dec 28 08:47:49 2011 +0000 +++ b/pidgin/gtkutils.c Wed Dec 28 09:00:48 2011 +0000 @@ -707,7 +707,6 @@ GtkTreeIter iter; GtkListStore *ls; GList *p; - const char *gtalk_name = NULL, *facebook_name = NULL; int i; ls = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER); @@ -716,50 +715,12 @@ aop_menu->default_item = -1; aop_menu->model = GTK_TREE_MODEL(ls); - 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); - pixbuf = pidgin_pixbuf_new_from_file(filename); - g_free(filename); - - gtk_list_store_append(ls, &iter); - gtk_list_store_set(ls, &iter, 0, pixbuf, 1, gtalk_name, 2, "prpl-jabber", -1); - - if (pixbuf) - g_object_unref(pixbuf); - - 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); - - pixbuf = pidgin_pixbuf_new_from_file(filename); - g_free(filename); - - gtk_list_store_append(ls, &iter); - gtk_list_store_set(ls, &iter, 0, pixbuf, 1, facebook_name, 2, "prpl-jabber", -1); - - if (pixbuf) - g_object_unref(pixbuf); - - facebook_name = NULL; - i++; - } - pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL); gtk_list_store_append(ls, &iter);