[maemo-commits] [maemo-commits] r15310 - in projects/haf/trunk/hildon-desktop: . libhildonwm

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2008-03-19 13:06:53 +0200 (Wed, 19 Mar 2008)
New Revision: 15310

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-application.c
Log:

2008-03-19  Johan Bilien  <johan.bilien at nokia.com>

	* libhildonwm/hd-wm-application.c (hd_wm_application_new):
	- when program have arguments specified in their desktop file,
	be sure to remove these from the default class_name.
	Patch courtesy of Adrian Bunk.
	Fixes: NB#80487



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-03-19 11:03:31 UTC (rev 15309)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-03-19 11:06:53 UTC (rev 15310)
@@ -1,5 +1,13 @@
 2008-03-19  Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildonwm/hd-wm-application.c (hd_wm_application_new):
+	- when program have arguments specified in their desktop file,
+	be sure to remove these from the default class_name.
+	Patch courtesy of Adrian Bunk.
+	Fixes: NB#80487
+
+2008-03-19  Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/hd-select-plugins-dialog.c (hd_select_plugins_dialog_get_store):
 	fixed the double free of a GError.
 

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-application.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-application.c	2008-03-19 11:03:31 UTC (rev 15309)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-application.c	2008-03-19 11:06:53 UTC (rev 15310)
@@ -624,8 +624,28 @@
   if (startup_wmclass != NULL)
     app->priv->class_name = startup_wmclass;
   else
-    app->priv->class_name = g_path_get_basename(exec_name);
+  {
+    gchar *class_name, *sep;
 
+    class_name = g_path_get_basename (exec_name);
+
+    /* we want only the program, not parameters passed to it */
+    sep = strstr (class_name, " ");
+    if (sep)
+    {
+      gchar *tmp;
+
+      *sep = 0;
+      tmp = g_strdup (class_name);
+
+      g_free (class_name);
+
+      class_name = tmp;
+    }
+
+    app->priv->class_name = class_name;
+  }
+
   app->priv->active_window = NULL;
   hd_wm_debug ("Registered new watchable app\n"
 	 "\texec name: %s\n"