Hello community, here is the log from the commit of package lxterminal for openSUSE:Factory checked in at 2014-08-25 11:05:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxterminal (Old) and /work/SRC/openSUSE:Factory/.lxterminal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxterminal" Changes: -------- --- /work/SRC/openSUSE:Factory/lxterminal/lxterminal.changes 2011-09-26 17:05:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxterminal.new/lxterminal.changes 2014-08-25 11:06:27.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 17 18:51:29 UTC 2014 - [email protected] + +- added lxterminal-0.1.11_fix_ctrl_c_break.patch to fix bnc#891851 + +------------------------------------------------------------------- New: ---- lxterminal-0.1.11_fix_ctrl_c_break.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxterminal.spec ++++++ --- /var/tmp/diff_new_pack.QK0rYb/_old 2014-08-25 11:06:28.000000000 +0200 +++ /var/tmp/diff_new_pack.QK0rYb/_new 2014-08-25 11:06:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxterminal # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,23 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: lxterminal Version: 0.1.11 -Release: 11 +Release: 0 Summary: Lightweight LXDE Terminal -Group: System/GUI/LXDE License: GPL-2.0 +Group: System/GUI/LXDE Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 # PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch [email protected] # disable f10 shortcut because yast use it Patch0: %name-0.1.8-disable-f10.patch +Patch1: %name-0.1.11_fix_ctrl_c_break.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files -BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel +BuildRequires: docbook-utils +BuildRequires: docbook-xsl-stylesheets +BuildRequires: fdupes +BuildRequires: gtk2-devel +BuildRequires: intltool +BuildRequires: libxslt-devel +BuildRequires: pkg-config +BuildRequires: update-desktop-files %if %suse_version <= 1140 BuildRequires: vte-devel %else @@ -49,6 +54,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure --enable-man ++++++ lxterminal-0.1.11_fix_ctrl_c_break.patch ++++++ diff -uNr lxterminal-0.1.11/src/lxterminal.c lxterminal-0.1.11-new/src/lxterminal.c --- lxterminal-0.1.11/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200 +++ lxterminal-0.1.11-new/src/lxterminal.c 2014-08-17 20:49:58.543192398 +0200 @@ -69,29 +69,29 @@ /* Menu and accelerator event handlers. */ static void terminal_initialize_switch_tab_accelerator(Term * term); static void terminal_set_disable_alt(Term *term, gboolean disable_alt); -static void terminal_switch_tab_accelerator(Term * term); +static gboolean terminal_switch_tab_accelerator(Term * term); static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal); static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_next_tab_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_move_tab_execute(LXTerminal * terminal, gint direction); static void terminal_move_tab_left_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_move_tab_right_activate_event(GtkAction * action, LXTerminal * terminal); -static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); +static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item); static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal); /* Window creation, destruction, and control. */ @@ -327,11 +327,14 @@ /* Handler for accelerator <ALT> n, where n is a digit. * Switch to the tab selected by the digit, if it exists. */ -static void terminal_switch_tab_accelerator(Term * term) +static gboolean terminal_switch_tab_accelerator(Term * term) { LXTerminal * terminal = term->parent; - if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) + if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) { gtk_notebook_set_current_page(GTK_NOTEBOOK(terminal->notebook), term->index); + return TRUE; + } + return FALSE; } /* Handler for "activate" signal on File/New Window menu item. @@ -344,9 +347,10 @@ } /* Handler for accelerator <SHIFT><CTRL> N. Open a new window. */ -static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_new_window_activate_event(NULL, terminal); + return TRUE; } /* Handler for "activate" signal on File/New Tab menu item. @@ -405,9 +409,10 @@ } /* Handler for accelerator <SHIFT><CTRL> T. Open a new tab. */ -static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_new_tab_activate_event(NULL, terminal); + return TRUE; } /* Handler for "activate" signal on File/Close Tab menu item. @@ -419,9 +424,10 @@ } /* Handler for accelerator <SHIFT><CTRL> W. Close the current tab. */ -static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_close_tab_activate_event(NULL, terminal); + return TRUE; } /* Handler for "activate" signal on Edit/Copy menu item. @@ -433,9 +439,10 @@ } /* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */ -static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_copy_activate_event(NULL, terminal); + return TRUE; } /* Handler for "activate" signal on Edit/Paste menu item. @@ -447,9 +454,10 @@ } /* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */ -static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_paste_activate_event(NULL, terminal); + return TRUE; } /* Handler for "response" signal on Name Tab dialog. */ @@ -521,9 +529,10 @@ } /* Handler for accelerator <CTRL><SHIFT> R. Name the tab. */ -static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_name_tab_activate_event(NULL, terminal); + return TRUE; } /* Handler for "activate" signal on Tabs/Previous Tab menu item. @@ -538,10 +547,11 @@ } /* Handler for accelerator <CTRL><PAGE UP>. Cycle through tabs in the reverse direction. */ -static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_PreviousTab"); gtk_action_activate(_action); + return TRUE; } /* Handler for "activate" signal on Tabs/Next Tab menu item. @@ -556,10 +566,11 @@ } /* Handler for accelerator <CTRL><PAGE DOWN>. Cycle through tabs in the forward direction. */ -static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_NextTab"); gtk_action_activate(_action); + return TRUE; } /* Helper for move tab left and right. */ @@ -594,9 +605,10 @@ } /* Handler for accelerator <SHIFT><CTRL><PAGE UP>. Move the tab one position in the reverse direction. */ -static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_move_tab_execute(terminal, -1); + return TRUE; } /* Handler for "activate" signal on Tabs/Move Tab Right menu item. @@ -607,9 +619,10 @@ } /* Handler for accelerator <SHIFT><CTRL><PAGE DOWN>. Move the tab one position in the forward direction. */ -static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) +static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item) { terminal_move_tab_execute(terminal, 1); + return TRUE; } /* Handler for "activate" signal on Help/About menu item. */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
