diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/xfce4-terminal | |
parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/xfce4-terminal')
-rw-r--r-- | extra/xfce4-terminal/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch | 50 |
2 files changed, 53 insertions, 3 deletions
diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD index 10611056f..675ec14e4 100644 --- a/extra/xfce4-terminal/PKGBUILD +++ b/extra/xfce4-terminal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198571 2013-10-30 15:41:02Z allan $ +# $Id: PKGBUILD 202765 2013-12-27 11:06:12Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-terminal -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ conflicts=('terminal') replaces=('terminal') install=$pkgname.install source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2) -sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35') +sha256sums=('912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch b/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch new file mode 100644 index 000000000..dba52d294 --- /dev/null +++ b/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch @@ -0,0 +1,50 @@ +From 71bd87a532f250d6bc98d52a5d546d43056bbd99 Mon Sep 17 00:00:00 2001 +From: Alistair Buxton <a.j.buxton@gmail.com> +Date: Sun, 13 Oct 2013 23:41:45 +0000 +Subject: Fix up the encoding menu creation. + +Don't add non-radio items to the radio item group. +Don't leak list nodes by prepending twice to the same list. +Fixes BUG #10395. +--- +diff --git a/terminal/terminal-encoding-action.c b/terminal/terminal-encoding-action.c +index 83242e9..77c916c 100644 +--- a/terminal/terminal-encoding-action.c ++++ b/terminal/terminal-encoding-action.c +@@ -253,7 +253,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + /* action to reset to the default */ + default_label = g_strdup_printf (_("Default (%s)"), default_charset); + item = gtk_radio_menu_item_new_with_label (groups, default_label); +- groups = g_slist_prepend (groups, item); ++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), found); + g_signal_connect (G_OBJECT (item), "activate", +@@ -267,7 +267,6 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + /* category item */ + item = gtk_menu_item_new_with_label (_(terminal_encodings_names[n])); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); +- groups = g_slist_prepend (groups, item); + gtk_widget_show (item); + + submenu = gtk_menu_new (); +@@ -281,7 +280,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + break; + + item2 = gtk_radio_menu_item_new_with_label (groups, charset); +- groups = g_slist_prepend (groups, item2); ++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2)); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2); + g_object_set_qdata (G_OBJECT (item2), encoding_action_quark, (gchar *) charset); + gtk_widget_show (item2); +@@ -304,7 +303,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu, + { + /* add an action with the unknown charset */ + item2 = gtk_radio_menu_item_new_with_label (groups, action->current); +- groups = g_slist_prepend (groups, item2); ++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2)); + g_object_set_qdata_full (G_OBJECT (item2), encoding_action_quark, + g_strdup (action->current), g_free); + gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2); +-- +cgit v0.9.2 |