Hello community, here is the log from the commit of package xfce4-terminal for openSUSE:Factory checked in at 2013-10-24 14:41:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-terminal (Old) and /work/SRC/openSUSE:Factory/.xfce4-terminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-terminal" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-terminal/xfce4-terminal.changes 2013-05-06 10:11:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-terminal.new/xfce4-terminal.changes 2013-10-24 14:41:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 23 18:58:44 UTC 2013 - lazy.k...@opensuse.org + +- Add xfce4-terminal-fix-up-the-encoding-menu-creation.patch: Fix + up the encoding menu creation (bxo#10395). + +------------------------------------------------------------------- New: ---- xfce4-terminal-fix-up-the-encoding-menu-creation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-terminal.spec ++++++ --- /var/tmp/diff_new_pack.ukbf9d/_old 2013-10-24 14:41:37.000000000 +0200 +++ /var/tmp/diff_new_pack.ukbf9d/_new 2013-10-24 14:41:37.000000000 +0200 @@ -25,6 +25,8 @@ Group: System/X11/Terminals Url: http://docs.xfce.org/apps/terminal/start Source0: http://archive.xfce.org/src/apps/xfce4-terminal/0.6/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM xfce4-terminal-fix-up-the-encoding-menu-creation.patch bxo#10395 a.j.bux...@gmail.com -- Fix up the encoding menu creation. +Patch0: xfce4-terminal-fix-up-the-encoding-menu-creation.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: update-desktop-files @@ -64,6 +66,7 @@ %prep %setup -q +%patch0 -p1 %build %configure ++++++ xfce4-terminal-fix-up-the-encoding-menu-creation.patch ++++++ >From 64c9565516304fa3376890d654d41a1e162c99eb Mon Sep 17 00:00:00 2001 From: Alistair Buxton <a.j.bux...@gmail.com> Date: Mon, 14 Oct 2013 00:41:45 +0100 Subject: [PATCH] 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. --- terminal/terminal-encoding-action.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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); -- 1.8.3.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
