Merge lp:~3v1n0/ubuntu/oneiric/libwnck/fix-800946 into lp:~ubuntu-desktop/libwnck/ubuntu

[Marco Trevisan (Treviño)]

Added the patch to fix the bug #800946

[Michael Vogt (mvo)]

The patch itself looks fine, but we should make sure that upstream also has it in order to avoid incompatible APIs.

[Michael Vogt (mvo)]

<vuntz> seb128: Trevinho and I discussed the patch and agreed on naming, he'll update the patch soon

Setting to "needs fixing" until this update happend.

review: Needs Fixing

[lp:~3v1n0/ubuntu/oneiric/libwnck/fix-800946]

41. By Marco Trevisan (Treviño) on 2011-07-30

Updated the libwnck WM_CLASS APIs patch accordingly to the lib developers

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

Patch updated according to what Vuntz told me. ;)

review: Needs Resubmitting

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

review: Abstain

[Sebastien Bacher (seb128)]

setting to rejected, that got upstream and is going to land in Oneiric with the new version of the library

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

Ok, this is cool reject! :P

Unmerged revisions

41. By Marco Trevisan (Treviño) on 2011-07-30

Updated the libwnck WM_CLASS APIs patch accordingly to the lib developers

40. By Marco Trevisan (Treviño) on 2011-06-23

Add support for WM_CLASS instance getter API

See Launchpad bug #800946 for more informations.

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-07 18:45:49 +0000
+++ debian/changelog	2011-07-30 01:41:34 +0000
@@ -1,3 +1,10 @@
+libwnck (1:2.30.6-0ubuntu5) oneiric; urgency=low
+
+  * debian/patches/03_Added_APIs_to_get_WM_CLASS_group_name_and_instance_name.patch
+    - Add support for WM_CLASS instance getter API (LP: #800946)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Sat, 30 Jul 2011 03:38:44 +0200
+
 libwnck (1:2.30.6-0ubuntu4) oneiric; urgency=low
 
   * debian/libwnck-dev.install:

=== added file 'debian/patches/03_Added_APIs_to_get_WM_CLASS_group_name_and_instance_name.patch'
--- debian/patches/03_Added_APIs_to_get_WM_CLASS_group_name_and_instance_name.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_Added_APIs_to_get_WM_CLASS_group_name_and_instance_name.patch	2011-07-30 01:41:34 +0000
@@ -0,0 +1,150 @@
+From 45504d9b179244892aab7b35de9013a92b03cbe4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?"Marco=20Trevisan=20(Trevi=C3=B1o)"?= <[e-mail]>
+Date: Sat, 30 Jul 2011 03:27:17 +0200
+Subject: [PATCH] Added APIs to get WM_CLASS group name and instance name of a
+ wnkWindow
+
+The old private getters for getting a window WM_CLASS name or WM_CLASS are now in
+wnck_window_get_class_group_name and wnck_window_get_class_instance_name
+
+With the previous libwnck implementation was impossible to retrive the wm_class
+instance, but only the class name (and just using a redundant Group-class struct)
+Now, for each window is possible to get also its WM_CLASS instance name that could
+differ for special windows or for sub-applications (i.e. chromium web-apps).
+
+This patch includes also an improvement to wnckprop, that now prints out also
+the window class instance.
+---
+ libwnck/private.h  |    3 ---
+ libwnck/screen.c   |    2 +-
+ libwnck/tasklist.c |    4 ++--
+ libwnck/window.c   |   26 ++++++++++++++++++++++++--
+ libwnck/window.h   |    5 ++++-
+ libwnck/wnckprop.c |    8 ++++++++
+ 6 files changed, 39 insertions(+), 9 deletions(-)
+
+diff --git a/libwnck/private.h b/libwnck/private.h
+index 97207fd..b4d6572 100644
+--- a/libwnck/private.h
++++ b/libwnck/private.h
+@@ -61,9 +61,6 @@ char*       _wnck_window_get_name_for_display (WnckWindow *window,
+                                                gboolean    use_state_decorations);
+ const char* _wnck_window_get_startup_id (WnckWindow *window);
+ 
+-const char* _wnck_window_get_resource_class (WnckWindow *window);
+-const char* _wnck_window_get_resource_name  (WnckWindow *window);
+-
+ time_t      _wnck_window_get_needs_attention_time (WnckWindow *window);
+ time_t      _wnck_window_or_transient_get_needs_attention_time (WnckWindow *window);
+ 
+diff --git a/libwnck/screen.c b/libwnck/screen.c
+index 07d66cf..fabbac0 100644
+--- a/libwnck/screen.c
++++ b/libwnck/screen.c
+@@ -1530,7 +1530,7 @@ update_client_list (WnckScreen *screen)
+ 
+ 	  /* Class group */
+ 
+-	  res_class = _wnck_window_get_resource_class (window);
++	  res_class = wnck_window_get_class_group_name (window);
+ 
+ 	  class_group = wnck_class_group_get (res_class);
+ 	  if (class_group == NULL)
+diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
+index 7e74d47..bf887cc 100644
+--- a/libwnck/tasklist.c
++++ b/libwnck/tasklist.c
+@@ -4228,8 +4228,8 @@ wnck_tasklist_check_end_sequence (WnckTasklist   *tasklist,
+   if (tasklist->priv->startup_sequences == NULL)
+     return;
+ 
+-  res_class = _wnck_window_get_resource_class (window);
+-  res_name = _wnck_window_get_resource_name (window);
++  res_class = wnck_window_get_class_group_name (window);
++  res_name = wnck_window_get_class_instance_name (window);
+ 
+   if (res_class == NULL && res_name == NULL)
+     return;
+diff --git a/libwnck/window.c b/libwnck/window.c
+index a6fcb81..ced342d 100644
+--- a/libwnck/window.c
++++ b/libwnck/window.c
+@@ -1172,16 +1172,38 @@ _wnck_window_get_startup_id (WnckWindow *window)
+   return window->priv->startup_id;
+ }
+ 
++/**
++ * wnck_window_get_class_group_name:
++ * @window: a #WnckWindow.
++ *
++ * Gets class group name parameter of the <ulink
++ * url="http://tronche.com/gui/x/icccm/sec-4.html&num;WM_CLASS">WM_CLASS Property</ulink>
++ * for the window @window.
++ * Note that using this function is actually like doing wnck_window_get_class_group()
++ * and then wnck_class_group_get_res_class()
++ *
++ * Return value: the class name for @window, or %NULL if @window has no class.
++ **/
+ const char*
+-_wnck_window_get_resource_class (WnckWindow *window)
++wnck_window_get_class_group_name (WnckWindow *window)
+ {
+   g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL);
+ 
+   return window->priv->res_class;
+ }
+ 
++/**
++ * wnck_window_get_class_instance_name:
++ * @window: a #WnckWindow.
++ *
++ * Gets class instance name parameter of the <ulink
++ * url="http://tronche.com/gui/x/icccm/sec-4.html&num;WM_CLASS">WM_CLASS Property</ulink>
++ * for the window @window.
++ *
++ * Return value: the class instance for @window, or %NULL if @window has no class instance.
++ **/
+ const char*
+-_wnck_window_get_resource_name (WnckWindow *window)
++wnck_window_get_class_instance_name (WnckWindow *window)
+ {
+   g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL);
+ 
+diff --git a/libwnck/window.h b/libwnck/window.h
+index 673f44a..dbdb529 100644
+--- a/libwnck/window.h
++++ b/libwnck/window.h
+@@ -299,7 +299,10 @@ WnckWindow*      wnck_window_get_transient    (WnckWindow *window);
+ gulong           wnck_window_get_group_leader (WnckWindow *window);
+ gulong           wnck_window_get_xid          (WnckWindow *window);
+ 
+-WnckClassGroup *wnck_window_get_class_group (WnckWindow *window);
++WnckClassGroup *wnck_window_get_class_group   (WnckWindow *window);
++
++const char* wnck_window_get_class_group_name    (WnckWindow *window);
++const char* wnck_window_get_class_instance_name (WnckWindow *window);
+ 
+ const char* wnck_window_get_session_id        (WnckWindow *window);
+ const char* wnck_window_get_session_id_utf8   (WnckWindow *window);
+diff --git a/libwnck/wnckprop.c b/libwnck/wnckprop.c
+index 81810fd..b8f363d 100644
+--- a/libwnck/wnckprop.c
++++ b/libwnck/wnckprop.c
+@@ -1507,6 +1507,14 @@ print_window (WnckWindow *window)
+    * same class. */
+   g_print (_("Class Group: %s\n"), buf);
+ 
++  if (wnck_window_get_class_instance_name (window))
++    buf = wnck_window_get_class_instance_name (window);
++  else
++    /* Translators: 'unset' in the sense of "something has not been set". */
++    buf = _("<unset>");
++
++  g_print (_("Class Instance: %s\n"), buf);
++
+   g_print (_("XID: %lu\n"), wnck_window_get_xid (window));
+ 
+   if (wnck_window_get_pid (window) != 0)
+-- 
+1.7.5.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-01-04 06:20:37 +0000
+++ debian/patches/series	2011-07-30 01:41:34 +0000
@@ -1,3 +1,4 @@
 01_tasklist_orientation.patch
 02_moveresize_static_gravity.patch
+03_Added_APIs_to_get_WM_CLASS_group_name_and_instance_name.patch
 99_ltmain_as-needed.patch