Author: freetz Date: Sun Apr 2 08:18:27 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
gnome-terminal-TERM.patch (1.5 -> 1.6) , gnome-terminal-desktop.patch (1.2
-> 1.3) , gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch (1.1
-> 1.2)
---- Diffs:
================================================================
Index: SOURCES/gnome-terminal-TERM.patch
diff -u SOURCES/gnome-terminal-TERM.patch:1.5
SOURCES/gnome-terminal-TERM.patch:1.6
--- SOURCES/gnome-terminal-TERM.patch:1.5 Fri Jul 25 22:10:20 2003
+++ SOURCES/gnome-terminal-TERM.patch Sun Apr 2 10:18:22 2006
@@ -1,11 +1,12 @@
---- gnome-terminal-1.9.7/src/terminal-screen.c.wiget Wed Jun 5 04:57:01 2002
-+++ gnome-terminal-1.9.7/src/terminal-screen.c Wed Jun 5 04:57:14 2002
-@@ -885,7 +885,7 @@
-
+diff -aurN gnome-terminal-2.13.90.orig/src/terminal-screen.c
gnome-terminal-2.13.90/src/terminal-screen.c
+--- gnome-terminal-2.13.90.orig/src/terminal-screen.c 2006-01-30
05:19:50.000000000 +0100
++++ gnome-terminal-2.13.90/src/terminal-screen.c 2006-01-30
23:25:26.100754000 +0100
+@@ -1111,7 +1111,7 @@
retval[i] = g_strdup ("COLORTERM="EXECUTABLE_NAME);
++i;
+
- retval[i] = g_strdup ("TERM=xterm"); /* FIXME configurable later? */
+ retval[i] = g_strdup ("TERM=gnome"); /* FIXME configurable later? */
++i;
+
retval[i] = g_strdup_printf ("WINDOWID=%ld",
- GDK_WINDOW_XWINDOW (term->window));
================================================================
Index: SOURCES/gnome-terminal-desktop.patch
diff -u SOURCES/gnome-terminal-desktop.patch:1.2
SOURCES/gnome-terminal-desktop.patch:1.3
--- SOURCES/gnome-terminal-desktop.patch:1.2 Tue Mar 29 00:29:05 2005
+++ SOURCES/gnome-terminal-desktop.patch Sun Apr 2 10:18:22 2006
@@ -1,10 +1,10 @@
-diff -ur gnome-terminal-2.6.1.orig/gnome-terminal.desktop.in.in
gnome-terminal-2.6.1/gnome-terminal.desktop.in.in
---- gnome-terminal-2.6.1.orig/gnome-terminal.desktop.in.in 2004-04-18
07:31:19.000000000 +0200
-+++ gnome-terminal-2.6.1/gnome-terminal.desktop.in.in 2004-08-24
01:20:13.240149960 +0200
-@@ -10,5 +10,5 @@
+diff -aurN gnome-terminal-2.13.90.orig/gnome-terminal.desktop.in.in
gnome-terminal-2.13.90/gnome-terminal.desktop.in.in
+--- gnome-terminal-2.13.90.orig/gnome-terminal.desktop.in.in 2006-01-30
05:19:36.000000000 +0100
++++ gnome-terminal-2.13.90/gnome-terminal.desktop.in.in 2006-01-30
23:28:18.360754000 +0100
+@@ -11,5 +11,5 @@
X-GNOME-Bugzilla-Product=gnome-terminal
X-GNOME-Bugzilla-Component=general
[EMAIL PROTECTED]@
--Categories=GNOME;Application;System;Utility;TerminalEmulator;
+-Categories=GNOME;GTK;Application;Utility;TerminalEmulator;
+Categories=GTK;GNOME;Utility;TerminalEmulator;
StartupNotify=true
================================================================
Index: SOURCES/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch
diff -u
SOURCES/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch:1.1
SOURCES/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch:1.2
--- SOURCES/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch:1.1
Fri May 7 14:42:15 2004
+++ SOURCES/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch
Sun Apr 2 10:18:22 2006
@@ -1,24 +1,25 @@
---- gnome-terminal-2.6.1/src/terminal-window.c~ 2004-05-07
14:31:44.364178354 +0200
-+++ gnome-terminal-2.6.1/src/terminal-window.c 2004-05-07 14:32:03.449429701
+0200
-@@ -1283,8 +1283,8 @@
- notebook = window->priv->notebook;
+diff -aurN gnome-terminal-2.13.90.orig/src/terminal-window.c
gnome-terminal-2.13.90/src/terminal-window.c
+--- gnome-terminal-2.13.90.orig/src/terminal-window.c 2006-01-12
15:06:03.000000000 +0100
++++ gnome-terminal-2.13.90/src/terminal-window.c 2006-01-30
23:34:19.630754000 +0100
+@@ -1361,8 +1361,8 @@
+ num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- gtk_widget_set_sensitive (window->priv->previous_tab_menuitem,
- page_num > 0);
-+ //gtk_widget_set_sensitive (window->priv->previous_tab_menuitem,
-+ // page_num > 0);
++ /*gtk_widget_set_sensitive (window->priv->previous_tab_menuitem,
++ page_num > 0);*/
+ on_last_page = (page_num >= num_pages - 1);
+
+@@ -1384,8 +1384,8 @@
+ gtk_widget_set_sensitive (window->priv->move_right_tab_menuitem, TRUE);
+ }
- /* FIXME
-@@ -1299,8 +1299,8 @@
- else
- gtk_widget_set_sensitive (window->priv->close_tab_menuitem, TRUE);
-
- gtk_widget_set_sensitive (window->priv->next_tab_menuitem,
- !on_last_page);
-+ //gtk_widget_set_sensitive (window->priv->next_tab_menuitem,
-+ // !on_last_page);
++ /*gtk_widget_set_sensitive (window->priv->next_tab_menuitem,
++ !on_last_page);*/
}
static void
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/gnome-terminal-TERM.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/SOURCES/gnome-terminal-desktop.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
