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

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-05-30 13:38:52 +0300 (Wed, 30 May 2007)
New Revision: 11974

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.c
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.h
   projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
Log:
2007-05-30  Moises Martinez  <moises.martinez at nokia.com>

        * libhildonwm/hd-wm.c:
        - send signal for launch banner when application has a proper name.
        * libhildonwm/hd-wm-watchable-app.[ch]:
        - Added method to change name of dummy HDWMWatchableApp
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-30 10:37:30 UTC (rev 11973)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-30 10:38:52 UTC (rev 11974)
@@ -1,3 +1,10 @@
+2007-05-30  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildonwm/hd-wm.c:
+	- send signal for launch banner when application has a proper name.
+	* libhildonwm/hd-wm-watchable-app.[ch]:
+	- Added method to change name of dummy HDWMWatchableApp
+	
 2007-05-29  Johan Bilien  <johan.bilien at nokia.com>
 
 	* configure.ac: 0.0.15
@@ -152,7 +159,7 @@
 	* libhildondesktop/hildon-desktop-popup-window.c:
 	- Send additional fake press/release event for overriding the
 	grabbing.
-	* configure.ac        (working copy)
+	* configure.ac 
 	* data/Makefile.am:
 	* data/install_sbapplet.sh:
 	- Added helper script for installing statusbar applets and to be used

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.c	2007-05-30 10:37:30 UTC (rev 11973)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.c	2007-05-30 10:38:52 UTC (rev 11974)
@@ -127,8 +127,8 @@
     }
 
   app->icon_name  = g_strdup("qgn_list_gene_default_app"); 
-  app->app_name   = g_strdup(_("Application"));
-  app->class_name = g_strdup(_("Application"));
+  app->app_name   = g_strdup("?");
+  app->class_name = g_strdup("?");
 
   HDWM_APP_SET_FLAG (app, HDWM_APP_DUMMY);
   
@@ -443,6 +443,19 @@
   return app->exec_name;
 }
 
+void 
+hd_wm_watchable_app_dummy_set_name (HDWMWatchableApp *app, const gchar *name)
+{
+  if (!hd_wm_watchable_app_is_dummy (app))
+    return;
+
+  g_free (app->app_name);
+  g_free (app->class_name);
+    
+  app->app_name   = g_strdup (name);
+  app->class_name = g_strdup (name);
+}	
+
 const gchar*
 hd_wm_watchable_app_get_name (HDWMWatchableApp *app)
 {

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.h
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.h	2007-05-30 10:37:30 UTC (rev 11973)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm-watchable-app.h	2007-05-30 10:38:52 UTC (rev 11974)
@@ -78,6 +78,17 @@
 hd_wm_watchable_app_get_exec (HDWMWatchableApp *app);
 
 /** 
+ * Set the name field set manually of an HDWMWatchableApp instance.
+ * If HDWMWatchableApp is not dummy it does nothing.
+ * 
+ * @param app HDWMWatchableApp instance
+ * 
+ * @return name field value
+ */
+void 
+hd_wm_watchable_app_dummy_set_name (HDWMWatchableApp *app, const gchar *name);
+
+/** 
  * Get the name field set via .desktop file of an HDWMWatchableApp instance. 
  * You should not free the result.
  * 

Modified: projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-05-30 10:37:30 UTC (rev 11973)
+++ projects/haf/trunk/hildon-desktop/libhildonwm/hd-wm.c	2007-05-30 10:38:52 UTC (rev 11974)
@@ -554,9 +554,13 @@
   if (class_hint.res_name)
     XFree(class_hint.res_name);
 
-  if (!hd_wm_watchable_app_has_any_windows (app))
+  if (app && 
+      !hd_wm_watchable_app_has_any_windows (app) && 
+      !hd_wm_watchable_app_is_dummy (app))
+  {	  
     g_signal_emit_by_name (hdwm, "application-starting", app);
-	  
+  }
+
   return app;
 }
 
@@ -2132,9 +2136,15 @@
 	  hd_wm_watched_window_props_sync (win, HD_WM_SYNC_HILDON_VIEW_LIST);
 
 	  if (hd_wm_watchable_app_is_dummy (app))
+          {		  
             g_warning("Application %s did not provide valid .desktop file",
                       hd_wm_watched_window_get_name(win));
 
+	    hd_wm_watchable_app_dummy_set_name (app, hd_wm_watched_window_get_name(win));
+
+	    g_signal_emit_by_name (hdwm, "application-starting", app);
+	  }
+
 	  HDEntryInfo *info;
 
 	  HN_MARK();