diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-23 00:55:32 -0200 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-10-23 00:55:32 -0200 |
commit | 326b3b12c3ef06ac00b9682b0335934742cff208 (patch) | |
tree | 0e9c6a87698d813cc67c44cd1152681e94382484 /nonprism/pidgin/nonprism.patch | |
parent | fd14f6923454bf9166d70e46294ee0f0711be262 (diff) | |
parent | 5b3849e6d5b1245681519ad1b5bc0dcded5a0801 (diff) | |
download | abslibre-326b3b12c3ef06ac00b9682b0335934742cff208.tar.gz abslibre-326b3b12c3ef06ac00b9682b0335934742cff208.tar.bz2 abslibre-326b3b12c3ef06ac00b9682b0335934742cff208.zip |
Merge branch 'master' of ssh://projects.parabola.nu:1863/~git/abslibre
Diffstat (limited to 'nonprism/pidgin/nonprism.patch')
-rw-r--r-- | nonprism/pidgin/nonprism.patch | 15 |
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++; - } |