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

[From: subversion at stage.maemo.org]

Author: lucasr
Date: 2007-03-02 15:54:16 +0200 (Fri, 02 Mar 2007)
New Revision: 10329

Added:
   projects/haf/trunk/hildon-desktop/data/applications.menu
Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/data/Makefile.am
   projects/haf/trunk/hildon-desktop/src/hn-others-button.c
Log:
2007-03-02  Lucas Rocha  <lucas.rocha at nokia.com>

	* data/applications.menu, data/Makefile.am: add menu definition file
	to the package.
	* src/hn-others-button.c: report file monitoring failing warnings, not
	as a fatal error.


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-02 13:50:42 UTC (rev 10328)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-03-02 13:54:16 UTC (rev 10329)
@@ -1,3 +1,10 @@
+2007-03-02  Lucas Rocha  <lucas.rocha at nokia.com>
+
+	* data/applications.menu, data/Makefile.am: add menu definition file
+	to the package.
+	* src/hn-others-button.c: report file monitoring failing warnings, not
+	as a fatal error.
+
 2007-03-02  Moises Martinez  <moises.martinez at nokia.com>
 
 	* libhildondesktop/hildon-desktop-notification-manager.h:

Modified: projects/haf/trunk/hildon-desktop/data/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/data/Makefile.am	2007-03-02 13:50:42 UTC (rev 10328)
+++ projects/haf/trunk/hildon-desktop/data/Makefile.am	2007-03-02 13:54:16 UTC (rev 10329)
@@ -10,6 +10,9 @@
 	app-switcher.desktop       \
         others-button.desktop	
 
+applications_menudir = $(sysconfdir)/xdg/menus
+applications_menu_DATA = applications.menu
+
 hildondesktopstartup_SCRIPTS = \
         hildon-desktop.sh
 

Added: projects/haf/trunk/hildon-desktop/data/applications.menu
===================================================================
--- projects/haf/trunk/hildon-desktop/data/applications.menu	2007-03-02 13:50:42 UTC (rev 10328)
+++ projects/haf/trunk/hildon-desktop/data/applications.menu	2007-03-02 13:54:16 UTC (rev 10329)
@@ -0,0 +1,90 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+
+<Menu>
+
+  <!-- This is actually not needed -->
+  <Name>Others Menu</Name>
+
+  <!-- Search the default locations -->
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  
+  <!-- Favourites -->
+  <Include>
+    <Filename>mp_ui.desktop</Filename>
+    <Filename>osso_rss_feed_reader.desktop</Filename>
+    <Filename>image-viewer.desktop</Filename>
+    <Filename>filemanager.desktop</Filename>
+  </Include>
+
+  <Separator/>
+  
+  <!-- Web submenu -->
+  <Menu>
+    <Name>tana_fi_web</Name>
+    <Include>
+      <Filename>browser.desktop</Filename>
+      <Filename>bookmark.desktop</Filename>
+    </Include>
+  </Menu>
+  
+  <!-- Contact submenu -->
+  <Menu>
+    <Name>tana_fi_contact</Name>
+    <Include>
+      <Filename>osso-addressbook.desktop</Filename>
+      <Filename>email-engine.desktop</Filename>
+      <Filename>voip-ui.desktop</Filename>
+      <Filename>chat-ui.desktop</Filename>
+    </Include>
+  </Menu>
+  
+  <!-- Utilities submenu -->
+  <Menu>
+    <Name>tana_fi_utilities</Name>
+    <Include>
+      <Filename>osso_calculator.desktop</Filename>
+      <Filename>osso_worldclock.desktop</Filename>
+      <Filename>osso_notes.desktop</Filename>
+      <Filename>osso_pdfviewer.desktop</Filename>
+      <Filename>osso_sketch.desktop</Filename>
+    </Include>
+  </Menu>
+ 
+  <!-- Games submenu -->
+  <Menu>
+    <Name>tana_fi_games</Name>
+    <Include>
+      <Filename>chess_startup.desktop</Filename>
+      <Filename>maemoblocks.desktop</Filename>
+      <Filename>mahjong_startup.desktop</Filename>
+      <Filename>osso_lmarbles.desktop</Filename>
+    </Include>
+  </Menu>
+
+  <!-- Tools submenu -->
+  <Menu>
+    <Name>tana_fi_tools</Name>
+    <Include>
+      <Filename>osso-application-installer.desktop</Filename>
+      <Filename>osso-backup.desktop</Filename>
+      <Filename>hildon-control-panel.desktop</Filename>
+      <Filename>osso-connectivity-ui-connmgr.desktop</Filename>
+      <Filename>hwr-teacher.desktop</Filename>
+    </Include>
+  </Menu>
+ 
+  <!-- Extras submenu -->
+  <Menu>
+    <Name>tana_fi_extras</Name>
+  </Menu>
+
+  <Separator/>
+
+  <Include>
+    <Filename>osso-global-search.desktop</Filename>
+    <Filename>osso_help.desktop</Filename>
+  </Include>
+
+</Menu>

Modified: projects/haf/trunk/hildon-desktop/src/hn-others-button.c
===================================================================
--- projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-03-02 13:50:42 UTC (rev 10328)
+++ projects/haf/trunk/hildon-desktop/src/hn-others-button.c	2007-03-02 13:54:16 UTC (rev 10329)
@@ -1033,9 +1033,9 @@
                              (GnomeVFSMonitorCallback) hn_others_button_dir_changed,
                              button) != GNOME_VFS_OK)
   {
-    g_error ("Others_menu_initialize_menu: "
-      	     "failed setting monitor callback "
-      	     "for systemwide menu conf." );
+    g_warning ("Others_menu_initialize_menu: "
+      	       "failed setting monitor callback "
+      	       "for systemwide menu conf." );
   }
 
   g_free (dir);
@@ -1057,9 +1057,9 @@
                                  (GnomeVFSMonitorCallback) hn_others_button_dir_changed,
                                  button) != GNOME_VFS_OK)
       {
-        g_error ("Others_menu_initialize_menu: "
-      	         "failed setting monitor callback "
-      	         "for user specific menu conf." );
+        g_warning ("Others_menu_initialize_menu: "
+      	           "failed setting monitor callback "
+      	           "for user specific menu conf." );
       }
     }
     else
@@ -1081,9 +1081,9 @@
                              (GnomeVFSMonitorCallback) hn_others_button_dir_changed,
                              button) != GNOME_VFS_OK)
   {
-    g_error ("Others_menu_initialize_menu: "
-      	     "failed setting monitor callback "
-      	     "for .desktop directory." );
+    g_warning ("Others_menu_initialize_menu: "
+      	       "failed setting monitor callback "
+      	       "for .desktop directory." );
   }
 }