- update to version 0.6.3

- improve URL matching (bxo#7959, bxo#9800)
  - fix encoding menu creation (bxo#10395)
  - added light solarized colorscheme (bxo#10286)
  - fixed wrong foreground color in solarized dark (bxo#10285)
  - fix terminal session restore (bxo#9732)
  - translation updates
- drop obsolete
  xfce4-terminal-fix-up-the-encoding-menu-creation.patch

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-terminal?expand=0&rev=13
This commit is contained in:
Guido Berhoerster 2013-12-27 11:03:11 +00:00 committed by Git OBS Bridge
parent c353304057
commit 817fe4b777
5 changed files with 17 additions and 61 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35
size 840182

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08
size 815207

View File

@ -1,54 +0,0 @@
From 64c9565516304fa3376890d654d41a1e162c99eb Mon Sep 17 00:00:00 2001
From: Alistair Buxton <a.j.buxton@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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Dec 27 10:50:14 UTC 2013 - gber@opensuse.org
- update to version 0.6.3
- improve URL matching (bxo#7959, bxo#9800)
- fix encoding menu creation (bxo#10395)
- added light solarized colorscheme (bxo#10286)
- fixed wrong foreground color in solarized dark (bxo#10285)
- fix terminal session restore (bxo#9732)
- translation updates
- drop obsolete
xfce4-terminal-fix-up-the-encoding-menu-creation.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 23 18:58:44 UTC 2013 - lazy.kent@opensuse.org Wed Oct 23 18:58:44 UTC 2013 - lazy.kent@opensuse.org

View File

@ -18,15 +18,13 @@
Name: xfce4-terminal Name: xfce4-terminal
Version: 0.6.2 Version: 0.6.3
Release: 0 Release: 0
Summary: Terminal Emulator for the Xfce Desktop Environment Summary: Terminal Emulator for the Xfce Desktop Environment
License: GPL-2.0+ License: GPL-2.0+
Group: System/X11/Terminals Group: System/X11/Terminals
Url: http://docs.xfce.org/apps/terminal/start Url: http://docs.xfce.org/apps/terminal/start
Source0: http://archive.xfce.org/src/apps/xfce4-terminal/0.6/%{name}-%{version}.tar.bz2 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.buxton@gmail.com -- Fix up the encoding menu creation.
Patch0: xfce4-terminal-fix-up-the-encoding-menu-creation.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: intltool BuildRequires: intltool
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
@ -66,7 +64,6 @@ Provides translations to the package %{name}
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure %configure