[maemo-commits] [maemo-commits] r12280 - in projects/haf/trunk/hildon-desktop: . src

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-06-13 17:28:31 +0300 (Wed, 13 Jun 2007)
New Revision: 12280

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
   projects/haf/trunk/hildon-desktop/src/hn-others-button.c
Log:
2007-06-13  Lucas Rocha  <lucas.rocha at nokia.com>

	* src/hn-others-button.c, src/hd-applications-menu.c: keep track of changes 
	in the standard	application directory and hildon-specific application 
	directory to update the menu accordingly. Fixes bug NB#16392.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-13 14:24:01 UTC (rev 12279)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-13 14:28:31 UTC (rev 12280)
@@ -1,5 +1,11 @@
 2007-06-13  Lucas Rocha  <lucas.rocha at nokia.com>
 
+	* src/hn-others-button.c, src/hd-applications-menu.c: keep track of changes 
+	in the standard	application directory and hildon-specific application 
+	directory to update the menu accordingly. Fixes bug NB#16392.
+
+2007-06-13  Lucas Rocha  <lucas.rocha at nokia.com>
+
 	* libhildondesktop/hildon-desktop-popup-menu.c: allow activating menu
 	items with GDK_Return.
 

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2007-06-13 14:24:01 UTC (rev 12279)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2007-06-13 14:28:31 UTC (rev 12280)
@@ -75,7 +75,6 @@
                   hildondesktopentrydir=`pkg-config osso-af-settings --variable=desktopentrydir`
                   hildondesktoplibdir=`pkg-config osso-af-settings --variable=hildondesktoplibdir`
 
-
                   hildonnavigatordesktopentrydir=`pkg-config osso-af-settings --variable=tasknavigatordesktopentrydir`
                   hildonhomedesktopentrydir=`pkg-config osso-af-settings --variable=homedesktopentrydir`
                   hildonstatusbardesktopentrydir=`pkg-config osso-af-settings --variable=statusbardesktopentrydir`

Modified: projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-06-13 14:24:01 UTC (rev 12279)
+++ projects/haf/trunk/hildon-desktop/src/hd-applications-menu.c	2007-06-13 14:28:31 UTC (rev 12280)
@@ -1124,6 +1124,19 @@
       	       "failed setting monitor callback "
       	       "for .desktop directory." );
   }
+
+  /* Monitor the hildon .desktop directories, so we can regenerate the 
+   * menu when a new application is installed */
+  if (gnome_vfs_monitor_add (&button->priv->desktop_dir_monitor, 
+                             HD_DESKTOP_ENTRY_PATH "/hildon",
+                             GNOME_VFS_MONITOR_DIRECTORY,
+                             (GnomeVFSMonitorCallback) hd_applications_menu_dir_changed,
+                             button) != GNOME_VFS_OK)
+  {
+    g_warning ("Others_menu_initialize_menu: "
+      	       "failed setting monitor callback "
+      	       "for .desktop directory." );
+  }
 }
 
 void

Modified: projects/haf/trunk/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-06-13 14:24:01 UTC (rev 12279)
+++ projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-06-13 14:28:31 UTC (rev 12280)
@@ -1082,6 +1082,19 @@
       	       "failed setting monitor callback "
       	       "for .desktop directory." );
   }
+
+  /* Monitor the hildon .desktop directories, so we can regenerate the 
+   * menu when a new application is installed */
+  if (gnome_vfs_monitor_add (&button->priv->desktop_dir_monitor, 
+                             HD_DESKTOP_ENTRY_PATH "/hildon",
+                             GNOME_VFS_MONITOR_DIRECTORY,
+                             (GnomeVFSMonitorCallback) hn_others_button_dir_changed,
+                             button) != GNOME_VFS_OK)
+  {
+    g_warning ("Others_menu_initialize_menu: "
+      	       "failed setting monitor callback "
+      	       "for .desktop directory." );
+  }
 }
 
 void