Merge lp:~larsu/gtk/lp1443273 into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Lars Karlitski]

Allow overriding WM_CLASS from the command line

Even when the program itself calls gdk_set_program_class(). There's currently no way for this function to be called without breaking gdk's --class command line option, because you cannot call it before gtk_init().

[Didier Roche-Tolomelli (didrocks)]

Looking good to me, works for my use case at least, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-13 06:07:25 +0000
+++ debian/changelog	2015-04-13 06:43:15 +0000
@@ -1,3 +1,11 @@
+gtk+3.0 (3.14.12-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/allow-overriding-WM_CLASS-from-the-command-line.patch:
+    support --class even when the program calls gdk_set_program_class().
+    Needed for gnome-terminal profile-as-app backwards compat (LP: #1443273)
+
+ -- Lars Uebernickel <[e-mail]>  Mon, 13 Apr 2015 08:31:13 +0200
+
 gtk+3.0 (3.14.12-0ubuntu1) vivid; urgency=medium
 
   * New upstream release 3.14.12, fixing bugs:

=== added file 'debian/patches/allow-overriding-WM_CLASS-from-the-command-line.patch'
--- debian/patches/allow-overriding-WM_CLASS-from-the-command-line.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/allow-overriding-WM_CLASS-from-the-command-line.patch	2015-04-13 06:43:15 +0000
@@ -0,0 +1,55 @@
+From f261b3d59fd9ac1adb044457ec98a622fca1e3c0 Mon Sep 17 00:00:00 2001
+From: Lars Uebernickel <[e-mail]>
+Date: Fri, 10 Apr 2015 17:18:50 +0200
+Subject: [PATCH] Allow overriding WM_CLASS from the command line
+
+Even when the program itself calls gdk_set_program_class(). There's
+currently no way for this function to be called without breaking gdk's
+--class command line option, because you cannot call it before
+gtk_init().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=747634
+---
+ gdk/gdk.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gdk/gdk.c b/gdk/gdk.c
+index 81f5427..c416abf 100644
+--- a/gdk/gdk.c
++++ b/gdk/gdk.c
+@@ -128,6 +128,7 @@ static int gdk_initialized = 0;                     /* 1 if the library is initi
+                                                      */
+ 
+ static gchar  *gdk_progclass = NULL;
++static gboolean gdk_progclass_overridden;
+ 
+ static GMutex gdk_threads_mutex;
+ 
+@@ -196,6 +197,7 @@ static gboolean
+ gdk_arg_class_cb (const char *key, const char *value, gpointer user_data, GError **error)
+ {
+   gdk_set_program_class (value);
++  gdk_progclass_overridden = TRUE;
+ 
+   return TRUE;
+ }
+@@ -962,10 +964,16 @@ gdk_get_program_class (void)
+  * Sets the program class. The X11 backend uses the program class to set
+  * the class name part of the `WM_CLASS` property on
+  * toplevel windows; see the ICCCM.
++ *
++ * The program class can still be overridden with the --class command
++ * line option.
+  */
+ void
+ gdk_set_program_class (const char *program_class)
+ {
++  if (gdk_progclass_overridden)
++    return;
++
+   g_free (gdk_progclass);
+ 
+   gdk_progclass = g_strdup (program_class);
+-- 
+2.1.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-13 06:06:44 +0000
+++ debian/patches/series	2015-04-13 06:43:15 +0000
@@ -23,3 +23,4 @@
 mir-backend-unmerged.patch
 0001-gtk-reftest-Force-icon-theme-to-Adwaita.patch
 0001-GtkApplication-Prevent-more-crashes-around-shutdown.patch
+allow-overriding-WM_CLASS-from-the-command-line.patch