r16973 - in /packages/experimental/devhelp/debian: changelog patches/04_close_correct_tab.patch patches/series

[brad-guest at users.alioth.debian.org]

Author: brad-guest
Date: Wed Sep 17 15:35:55 2008
New Revision: 16973

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16973
Log:
Add 04_close_correct_tab.patch - Close correct tab when pressing close
button.

Added:
    packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch
Modified:
    packages/experimental/devhelp/debian/changelog
    packages/experimental/devhelp/debian/patches/series

Modified: packages/experimental/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/changelog?rev=16973&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/changelog (original)
+++ packages/experimental/devhelp/debian/changelog Wed Sep 17 15:35:55 2008
@@ -8,6 +8,8 @@
   * Drop 02_gecko_1.9.patch - Gone upstream.
   * Drop 70_autoconf.patch - No longer needed.
   * Split out alpha FTBFS fix into 02_fix_alpha_ftbfs.patch.
+  * Add 04_close_correct_tab.patch - Close correct tab when pressing close
+    button.
 
  -- Bradley Smith <brad at brad-smith.co.uk>  Wed, 10 Sep 2008 17:32:35 +0100
 

Added: packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch?rev=16973&op=file
==============================================================================
--- packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch (added)
+++ packages/experimental/devhelp/debian/patches/04_close_correct_tab.patch Wed Sep 17 15:35:55 2008
@@ -1,0 +1,77 @@
+diff -Naur devhelp-0.20/src/dh-window.c devhelp-0.20.new/src/dh-window.c
+--- devhelp-0.20/src/dh-window.c	2008-09-08 08:29:57.000000000 +0100
++++ devhelp-0.20.new/src/dh-window.c	2008-09-17 16:32:09.000000000 +0100
+@@ -99,7 +99,8 @@
+ static void       window_activate_new_tab         (GtkAction       *action,
+ 						   DhWindow        *window);
+ static void       window_activate_close           (GtkAction       *action,
+-						   DhWindow        *window);
++						   DhWindow        *window,
++						   GtkWidget       *frame);
+ static void       window_activate_quit            (GtkAction       *action,
+ 						   DhWindow        *window);
+ static void       window_activate_copy            (GtkAction       *action,
+@@ -170,7 +171,8 @@
+ static void       window_findbar_close_cb         (GtkWidget       *widget,
+ 						   DhWindow        *window);
+ static GtkWidget *window_new_tab_label            (DhWindow        *window,
+-						   const gchar     *label);
++						   const gchar     *label,
++						   GtkWidget       *frame);
+ static void       window_open_new_tab             (DhWindow        *window,
+ 						   const gchar     *location);
+ static DhHtml *   window_get_active_html          (DhWindow        *window);
+@@ -601,14 +603,15 @@
+ }
+ 
+ static void
+-window_activate_close (GtkAction *action, DhWindow *window)
++window_activate_close (GtkAction *action, DhWindow *window,
++	GtkWidget *frame)
+ {
+ 	DhWindowPriv *priv;
+ 	gint          page_num;
+ 
+ 	priv = window->priv;
+ 
+-	page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->html_notebook));
++	page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->html_notebook), frame);
+         gtk_notebook_remove_page (GTK_NOTEBOOK (priv->html_notebook), page_num);
+ 
+ 	if (gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->html_notebook)) == 0) {
+@@ -1183,7 +1186,7 @@
+ 
+ 	g_object_set_data (G_OBJECT (frame), "html", html);
+ 
+-	label = window_new_tab_label (window, _("Empty Page"));
++	label = window_new_tab_label (window, _("Empty Page"), frame);
+ 	gtk_widget_show_all (label);
+ 
+ 	g_signal_connect (html, "title-changed",
+@@ -1230,7 +1233,8 @@
+ 	
+ 	action_close = gtk_action_group_get_action (window->priv->action_group,
+ 						    "Close");
+-	window_activate_close (action_close, window);
++	window_activate_close (action_close, window,
++		g_object_get_data (G_OBJECT (button), "frame"));
+ }
+ 
+ static void
+@@ -1262,7 +1266,7 @@
+ }
+ 
+ static GtkWidget*
+-window_new_tab_label (DhWindow *window, const gchar *str)
++window_new_tab_label (DhWindow *window, const gchar *str, GtkWidget *frame)
+ {
+ 	GtkWidget  *hbox, *label, *close_button, *image;
+ 	
+@@ -1297,6 +1301,7 @@
+ 	
+ 	g_object_set_data (G_OBJECT (hbox), "label", label);
+ 	g_object_set_data (G_OBJECT (hbox), "close-button", close_button);
++	g_object_set_data (G_OBJECT (close_button), "frame", frame);
+ 
+ 	return hbox;
+ }

Modified: packages/experimental/devhelp/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/devhelp/debian/patches/series?rev=16973&op=diff
==============================================================================
--- packages/experimental/devhelp/debian/patches/series (original)
+++ packages/experimental/devhelp/debian/patches/series Wed Sep 17 15:35:55 2008
@@ -2,3 +2,4 @@
 01_do_not_clober_global_w_on_el.patch
 02_fix_alpha_ftbfs.patch
 03html2diff_close_sub.patch
+04_close_correct_tab.patch