[maemo-commits] [maemo-commits] r15449 - in projects/haf/trunk/hildon-desktop: . data debian src

[From: subversion at stage.maemo.org]

Author: novo
Date: 2008-04-17 08:57:09 +0300 (Thu, 17 Apr 2008)
New Revision: 15449

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/data/restore-menu.sh
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/src/hd-desktop.c
Log:
2008-04-16  Karl Lattimer <karl.lattimer at nokia.com>

	* data/restore-menu.sh: Reworked the original update for chinook backup restore
	to remove a dodgy escaped newline character, which was causing an invalid file
	* configure.ac: 2.0.15



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-04-16 14:14:04 UTC (rev 15448)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-04-17 05:57:09 UTC (rev 15449)
@@ -1,5 +1,11 @@
 2008-04-16  Karl Lattimer <karl.lattimer at nokia.com>
 
+	* data/restore-menu.sh: Reworked the original update for chinook backup restore
+	to remove a dodgy escaped newline character, which was causing an invalid file
+	* configure.ac: 2.0.15
+
+2008-04-16  Karl Lattimer <karl.lattimer at nokia.com>
+
 	* libhildondesktop/hildon-desktop-notification-manager.c: reverse
         2.0.11 patch to fix memory leak, appears to be a double free.
 	* configure.ac: 2.0.14

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2008-04-16 14:14:04 UTC (rev 15448)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2008-04-17 05:57:09 UTC (rev 15449)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 2.0.14)
+AM_INIT_AUTOMAKE(hildon-desktop, 2.0.15)
 
 AM_CONFIG_HEADER(config.h)
 

Modified: projects/haf/trunk/hildon-desktop/data/restore-menu.sh
===================================================================
--- projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2008-04-16 14:14:04 UTC (rev 15448)
+++ projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2008-04-17 05:57:09 UTC (rev 15449)
@@ -19,15 +19,17 @@
 
 if [ $2 != $OSSO_VERSION ]
 then
+  # NB#82941 - This might not be the right place to put this fix, however this file was intended to fix this problem.
+  # Removing the files does not work, this leads me to believe the files were already open when the removal 
+  # was supposed to take place.
+  # So instead before removing the file statusbar.conf we must ensure that the update notifier is added to the configured
+  # statusbar applets if the file fails to be removed later the update notifier will still be added. The extra echo is 
+  # is intended to avoid some weird xkbmap bug with \n
+  echo >> ${DESKTOP_CONF_DIR}/statusbar.conf
+  echo "[/usr/share/applications/hildon-status-bar/hildon-update-notifier.desktop]" >> ${DESKTOP_CONF_DIR}/statusbar.conf
+  echo "X-Load=true" >> ${DESKTOP_CONF_DIR}/statusbar.conf
+
   rm -f "${MENU_CONF_DIR}/applications.menu"
   rm -f "${DESKTOP_CONF_DIR}/*.conf"
-
-  # This might not be the right place to put this fix, however this file was intended to fix this problem.
-  # Removing the files as the code above suggests does not work, this leads me to believe the files were already
-  # open when the removal was supposed to take place.
-  # after removing the file statusbar.conf we must ensure that the update notifier is added to the configured
-  # statusbar applets. NB#82941
-  echo "\n[/usr/share/applications/hildon-status-bar/hildon-update-notifier.desktop]" >> ${DESKTOP_CONF_DIR}/statusbar.conf
-  echo "X-Load=true" >> ${DESKTOP_CONF_DIR}/statusbar.conf
 fi
 

Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2008-04-16 14:14:04 UTC (rev 15448)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2008-04-17 05:57:09 UTC (rev 15449)
@@ -1,3 +1,11 @@
+hildon-desktop (1:2.0.15-1) sardine; urgency=low
+
+  * data/restore-menu.sh: Reworked the original update for chinook backup restore
+    to remove a dodgy escaped newline character, which was causing an invalid file
+  * configure.ac: 2.0.15
+
+  -- Karl Lattimer <karl.lattimer at nokia.com>  Wed, 16 Apr 2008 17:54:35 +0300 
+
 hildon-desktop (1:2.0.14-1) sardine; urgency=low
 
   * libhildondesktop/hildon-desktop-notification-manager.c:  reverse

Modified: projects/haf/trunk/hildon-desktop/src/hd-desktop.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2008-04-16 14:14:04 UTC (rev 15448)
+++ projects/haf/trunk/hildon-desktop/src/hd-desktop.c	2008-04-17 05:57:09 UTC (rev 15449)
@@ -1337,10 +1337,14 @@
         g_free (tmp);
       }
 
-      hd_desktop_watch_dir (info->plugin_dirs[i_plugin_dir],
-                            hd_desktop_plugin_dir_changed,
-                            info->plugin_dir_monitors[i_plugin_dir],
-                            info);
+      /* Ignore home plugins to prevent NB#83963 */
+      if (!g_ascii_strcasecmp (info->plugin_dirs[i_plugin_dir], "/usr/share/applications/hildon-home"))
+      {
+        hd_desktop_watch_dir (info->plugin_dirs[i_plugin_dir],
+                              hd_desktop_plugin_dir_changed,
+                              info->plugin_dir_monitors[i_plugin_dir], 
+                              info);
+      }
     }
 
     g_hash_table_insert (priv->containers, container_config_file, info);