Author: benny
Date: 2006-11-17 16:11:26 +0000 (Fri, 17 Nov 2006)
New Revision: 23895
Modified:
terminal/trunk/ChangeLog
terminal/trunk/terminal/terminal-window.c
Log:
2006-11-17 Benedikt Meurer <[EMAIL PROTECTED]>
* terminal/terminal-window.c: Apply patch from Nick Schermer
<[EMAIL PROTECTED]> to allow reordering of tabs with GTK+ 2.10.x.
Bug #1974.
Modified: terminal/trunk/ChangeLog
===================================================================
--- terminal/trunk/ChangeLog 2006-11-17 09:44:20 UTC (rev 23894)
+++ terminal/trunk/ChangeLog 2006-11-17 16:11:26 UTC (rev 23895)
@@ -1,3 +1,9 @@
+2006-11-17 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * terminal/terminal-window.c: Apply patch from Nick Schermer
+ <[EMAIL PROTECTED]> to allow reordering of tabs with GTK+ 2.10.x.
+ Bug #1974.
+
2006-11-06 Benedikt Meurer <[EMAIL PROTECTED]>
* configure.in.in, terminal/Makefile.am: Fix installation on case
Modified: terminal/trunk/terminal/terminal-window.c
===================================================================
--- terminal/trunk/terminal/terminal-window.c 2006-11-17 09:44:20 UTC (rev
23894)
+++ terminal/trunk/terminal/terminal-window.c 2006-11-17 16:11:26 UTC (rev
23895)
@@ -103,6 +103,12 @@
GtkNotebookPage *page,
guint
page_num,
TerminalWindow *window);
+#if GTK_CHECK_VERSION (2,10,0)
+static void terminal_window_page_reordered (GtkNotebook
*notebook,
+
GtkNotebookPage *page,
+ guint
page_num,
+
TerminalWindow *window);
+#endif
static GtkWidget *terminal_window_get_context_menu
(TerminalScreen *screen,
TerminalWindow *window);
static void terminal_window_open_uri
(TerminalWindow *window,
@@ -400,6 +406,12 @@
G_CALLBACK (terminal_window_page_notified), window);
g_signal_connect (G_OBJECT (window->notebook), "remove",
G_CALLBACK (terminal_window_screen_removed), window);
+
+#if GTK_CHECK_VERSION (2,10,0)
+ g_signal_connect (G_OBJECT (window->notebook), "page-reordered",
+ G_CALLBACK (terminal_window_page_reordered), window);
+#endif
+
gtk_box_pack_start (GTK_BOX (vbox), window->notebook, TRUE, TRUE, 0);
gtk_widget_show (window->notebook);
@@ -898,6 +910,23 @@
+#if GTK_CHECK_VERSION (2,10,0)
+static void
+terminal_window_page_reordered (GtkNotebook *notebook,
+ GtkNotebookPage *page,
+ guint page_num,
+ TerminalWindow *window)
+{
+
+ /* Regenerate the "Go" menu.
+ * This also updates the accelerators.
+ */
+ terminal_window_rebuild_gomenu (window);
+}
+#endif
+
+
+
static GtkWidget*
terminal_window_get_context_menu (TerminalScreen *screen,
TerminalWindow *window)
@@ -1611,6 +1640,12 @@
GTK_WIDGET (screen),
TRUE, TRUE, GTK_PACK_START);
+#if GTK_CHECK_VERSION(2,10,0)
+ gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (window->notebook),
+ GTK_WIDGET (screen),
+ TRUE);
+#endif
+
/* check if we should always display tabs */
g_object_get (G_OBJECT (window->preferences), "misc-always-show-tabs",
&always_show_tabs, NULL);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
