summaryrefslogtreecommitdiff
path: root/nonprism/pidgin/nonprism.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-10-22 16:26:21 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-10-22 16:26:21 -0200
commit852cbdbbce596c8f65b18090fc429bfa9e84f191 (patch)
treec4644da8c8b6739b79557708c1da08fec3eb620f /nonprism/pidgin/nonprism.patch
parent32bf39a281b78c71bb8c063c485ab2111f249737 (diff)
pidgin-2.10.10-1.nonprism1: updating version
Diffstat (limited to 'nonprism/pidgin/nonprism.patch')
-rw-r--r--nonprism/pidgin/nonprism.patch15
1 files changed, 11 insertions, 4 deletions
diff --git a/nonprism/pidgin/nonprism.patch b/nonprism/pidgin/nonprism.patch
index 88140268e..d57c1ddd8 100644
--- a/nonprism/pidgin/nonprism.patch
+++ b/nonprism/pidgin/nonprism.patch
@@ -1,6 +1,5 @@
-diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
---- a/pidgin/gtkutils.c 2013-02-11 07:16:53.000000000 -0200
-+++ b/pidgin/gtkutils.c 2013-08-16 19:59:22.633298587 -0300
+--- 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;
@@ -9,7 +8,7 @@ diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils
int i;
aop_menu = g_malloc0(sizeof(AopMenu));
-@@ -686,55 +685,12 @@
+@@ -686,63 +685,12 @@
gtk_widget_show(aop_menu->menu);
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -39,6 +38,10 @@ diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils
- 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++;
- }
@@ -58,6 +61,10 @@ diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils
- 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++;
- }