Merge lp:~om26er/ubuntu/maverick/gnome-terminal/gnome-terminal-fix-630383 into lp:ubuntu/maverick/gnome-terminal

[Omer Akram]

backport the patch from mterry to fix bug 630383 in Maverick

[Dustin Kirkland  (kirkland)]

Hmm, this doesn't look quite right.

There's a patch file added, debian/patches/21_watch_clipboard.patch, which modifies src/terminal-window.c.

But there's also changes directly in src/terminal-window.c.

Looks like the diff is already applied in your proposed branch.

review: Needs Fixing

[Dustin Kirkland  (kirkland)]

Okay, I'm fixing this up.

I have:
 $ bzr revert src/terminal-window.c

To undo the in-branch change.

And I have updated the target release to maverick-proposed.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-09-27 17:05:38 +0000
+++ .pc/applied-patches	2011-03-13 15:27:02 +0000
@@ -2,3 +2,4 @@
 01_lpi.patch
 02_add_transparency_properties.patch
 20_add_alt_screen_toggle_ui.patch
+21_watch_clipboard.patch
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-27 17:05:38 +0000
+++ debian/changelog	2011-03-13 15:27:02 +0000
@@ -1,3 +1,10 @@
+gnome-terminal (2.32.0-0ubuntu1.1) maverick; urgency=low
+
+  * debian/patches/21_watch_clipboard.patch:
+    - Watch clipboard contents for paste shorkey to work. (LP: #630383)
+
+ -- Omer Akram <[e-mail]>  Sun, 13 Mar 2011 20:20:13 +0500
+
 gnome-terminal (2.32.0-0ubuntu1) maverick; urgency=low
 
   * New upstream version 2.32.0
 
=== added file 'debian/patches/21_watch_clipboard.patch'
--- debian/patches/21_watch_clipboard.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/21_watch_clipboard.patch	2011-03-13 15:27:02 +0000
@@ -0,0 +1,68 @@
+From: Omer Akram <[e-mail]>
+Author: Michael Terry <[e-mail]>
+Subject: Update paste sensitivity whenever clipboard changes.
+Bug: https://bugs.gnome.org/600876
+Bug-Ubuntu: https://launchpad.net/bugs/630383
+
+--- gnome-terminal-2.32.1.orig/src/terminal-window.c	2011-03-07 10:15:11.241700961 -0500
++++ gnome-terminal-2.32.1/src/terminal-window.c	2011-03-07 10:15:15.891838092 -0500
+@@ -1032,10 +1032,8 @@
+ }
+ 
+ static void
+-edit_menu_activate_callback (GtkMenuItem *menuitem,
+-                             gpointer     user_data)
++update_edit_menu (TerminalWindow *window)
+ {
+-  TerminalWindow *window = (TerminalWindow *) user_data;
+   GtkClipboard *clipboard;
+ 
+   clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
+@@ -1988,6 +1986,7 @@
+   GError *error;
+   GtkWindowGroup *window_group;
+   GtkAccelGroup *accel_group;
++  GtkClipboard *clipboard;
+ 
+   priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate);
+ 
+@@ -2061,15 +2060,10 @@
+   gtk_ui_manager_insert_action_group (manager, action_group, 0);
+   g_object_unref (action_group);
+ 
+-  action = gtk_action_group_get_action (action_group, "Edit");
+-  g_signal_connect (action, "activate",
+-                    G_CALLBACK (edit_menu_activate_callback), window);
+-
+-  /* Set this action invisible so the Edit menu doesn't flash the first
+-   * time it's shown and there's no text/uri-list on the clipboard.
+-   */
+-  action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths");
+-  gtk_action_set_visible (action, FALSE);
++  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
++  g_signal_connect_swapped (clipboard, "owner-change",
++                            G_CALLBACK (update_edit_menu), window);
++  update_edit_menu (window);
+ 
+   /* Idem for this action, since the window is not fullscreen. */
+   action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen");
+@@ -2162,6 +2156,7 @@
+   TerminalWindowPrivate *priv = window->priv;
+   TerminalApp *app;
+   GdkScreen *screen;
++  GtkClipboard *clipboard;
+ 
+   remove_popup_info (window);
+ 
+@@ -2186,6 +2181,11 @@
+                                         G_CALLBACK (terminal_window_encoding_list_changed_cb),
+                                         window);
+ 
++  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
++  g_signal_handlers_disconnect_by_func (clipboard,
++                                        G_CALLBACK (update_edit_menu),
++                                        window);
++
+   screen = gtk_widget_get_screen (GTK_WIDGET (object));
+   if (screen)
+     {
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-27 17:05:38 +0000
+++ debian/patches/series	2011-03-13 15:27:02 +0000
@@ -2,3 +2,4 @@
 01_lpi.patch
 02_add_transparency_properties.patch
 20_add_alt_screen_toggle_ui.patch
+21_watch_clipboard.patch
 
=== modified file 'src/terminal-window.c'
--- src/terminal-window.c	2010-09-27 17:05:38 +0000
+++ src/terminal-window.c	2011-03-13 15:27:02 +0000
@@ -1032,10 +1032,8 @@
 }
 
 static void
-edit_menu_activate_callback (GtkMenuItem *menuitem,
-                             gpointer     user_data)
+update_edit_menu (TerminalWindow *window)
 {
-  TerminalWindow *window = (TerminalWindow *) user_data;
   GtkClipboard *clipboard;
 
   clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
@@ -1988,6 +1986,7 @@
   GError *error;
   GtkWindowGroup *window_group;
   GtkAccelGroup *accel_group;
+  GtkClipboard *clipboard;
 
   priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, TERMINAL_TYPE_WINDOW, TerminalWindowPrivate);
 
@@ -2061,15 +2060,10 @@
   gtk_ui_manager_insert_action_group (manager, action_group, 0);
   g_object_unref (action_group);
 
-  action = gtk_action_group_get_action (action_group, "Edit");
-  g_signal_connect (action, "activate",
-                    G_CALLBACK (edit_menu_activate_callback), window);
-
-  /* Set this action invisible so the Edit menu doesn't flash the first
-   * time it's shown and there's no text/uri-list on the clipboard.
-   */
-  action = gtk_action_group_get_action (priv->action_group, "EditPasteURIPaths");
-  gtk_action_set_visible (action, FALSE);
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
+  g_signal_connect_swapped (clipboard, "owner-change",
+                            G_CALLBACK (update_edit_menu), window);
+  update_edit_menu (window);
 
   /* Idem for this action, since the window is not fullscreen. */
   action = gtk_action_group_get_action (priv->action_group, "PopupLeaveFullscreen");
@@ -2162,6 +2156,7 @@
   TerminalWindowPrivate *priv = window->priv;
   TerminalApp *app;
   GdkScreen *screen;
+  GtkClipboard *clipboard;
 
   remove_popup_info (window);
 
@@ -2186,6 +2181,11 @@
                                         G_CALLBACK (terminal_window_encoding_list_changed_cb),
                                         window);
 
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
+  g_signal_handlers_disconnect_by_func (clipboard,
+                                        G_CALLBACK (update_edit_menu),
+                                        window);
+
   screen = gtk_widget_get_screen (GTK_WIDGET (object));
   if (screen)
     {