Merge lp:~3v1n0/ubuntu/precise/gnome-control-center/add-window-role-to-panels into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Marco Trevisan (Treviño)]

Update the g-c-c window role when its content changes, this is needed by the BAMF branch lp:~3v1n0/bamf/g-control-center-rematching to fix the bug #801784 and rematch the g-c-c window when needed.

[Martin Pitt (pitti)]

Thanks! Can you please also forward this upstream? Please point to the upstream bug in the LP bug.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

That was the plan, but I forgot to submit it. So thanks for reminding me :)

Upstream bug is at https://bugzilla.gnome.org/show_bug.cgi?id=668504

[Martin Pitt (pitti)]

And committed already, nice!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-16 10:58:25 +0000
+++ debian/changelog	2012-01-21 00:35:27 +0000
@@ -1,11 +1,17 @@
 gnome-control-center (1:3.2.2-2ubuntu2) UNRELEASED; urgency=low
 
+  [ Sebastien Bacher ]
   * debian/libgnome-control-center1.symbols: restore the symbols tracking, 
     since we build external capplets we better check they don't break
   * debian/rules: don't build shlibs for a library which stopped being 
     distributed in GNOME3
 
- -- Sebastien Bacher <[e-mail]>  Mon, 16 Jan 2012 11:52:09 +0100
+  [ Marco Trevisan (Treviño) ]
+  * debian/patches/93_change_window_role_on_panel_change.patch:
+    - Set the gtk WM window role when changing panel, this is needed
+      to get the real window id and match the gcc in unity (LP: #801784) 
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Sat, 21 Jan 2012 01:02:11 +0100
 
 gnome-control-center (1:3.2.2-2ubuntu1) precise; urgency=low
 

=== added file 'debian/patches/93_change_window_role_on_panel_change.patch'
--- debian/patches/93_change_window_role_on_panel_change.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/93_change_window_role_on_panel_change.patch	2012-01-21 00:35:27 +0000
@@ -0,0 +1,20 @@
+Index: gnome-control-center/shell/gnome-control-center.c
+===================================================================
+--- gnome-control-center.orig/shell/gnome-control-center.c	2012-01-21 00:46:54.529573272 +0100
++++ gnome-control-center/shell/gnome-control-center.c	2012-01-21 00:46:59.321513028 +0100
+@@ -174,6 +174,7 @@
+ 
+           /* set the title of the window */
+           icon_name = get_icon_name_from_g_icon (gicon);
++          gtk_window_set_role (GTK_WINDOW (priv->window), id);
+           gtk_window_set_title (GTK_WINDOW (priv->window), name);
+           gtk_window_set_default_icon_name (icon_name);
+           gtk_window_set_icon_name (GTK_WINDOW (priv->window), icon_name);
+@@ -232,6 +233,7 @@
+   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (priv->lock_button), NULL);
+ 
+   /* reset window title and icon */
++  gtk_window_set_role (GTK_WINDOW (priv->window), NULL);
+   gtk_window_set_title (GTK_WINDOW (priv->window), priv->default_window_title);
+   gtk_window_set_default_icon_name (priv->default_window_icon);
+   gtk_window_set_icon_name (GTK_WINDOW (priv->window),

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-14 21:22:09 +0000
+++ debian/patches/series	2012-01-21 00:35:27 +0000
@@ -23,4 +23,4 @@
 90_git_sound_tab_order.patch
 91_git_build_use_fontconfig.patch
 92_git_minimal_output_height.patch
-
+93_change_window_role_on_panel_change.patch