Merge lp:~marcobiscaro2112/unity/fixes-754095 into lp:unity

[Marco Biscaro]

The gconf key that reflects the changes on default mail application is /desktop/gnome/url-handlers/mailto/command. So, unity should use this key.

This change fixes bug #754095.

=== modified file 'src/PlacesHomeView.cpp'
--- src/PlacesHomeView.cpp	2011-03-31 16:15:21 +0000
+++ src/PlacesHomeView.cpp	2011-04-11 00:33:30 +0000
@@ -48,7 +48,7 @@
 
 #define DESKTOP_DIR  "/desktop/gnome/applications"
 #define BROWSER_DIR  DESKTOP_DIR"/browser"
-#define CALENDAR_DIR DESKTOP_DIR"/calendar"
+#define MAIL_DIR     "/desktop/gnome/url-handlers/mailto"
 #define MEDIA_DIR    DESKTOP_DIR"/media"
 
 enum
@@ -109,7 +109,7 @@
                         GCONF_CLIENT_PRELOAD_NONE,
                         NULL);
   gconf_client_add_dir (_client,
-                        CALENDAR_DIR,
+                        MAIL_DIR,
                         GCONF_CLIENT_PRELOAD_NONE,
                         NULL);
   gconf_client_add_dir (_client,
@@ -122,7 +122,7 @@
                           this,
                           NULL, NULL);
   gconf_client_notify_add(_client,
-                          CALENDAR_DIR"/exec",
+                          MAIL_DIR"/command",
                           (GConfClientNotifyFunc)OnKeyChanged,
                           this,
                           NULL, NULL);
@@ -260,7 +260,9 @@
   CreateShortcutFromExec ("shotwell", _("View Photos"), _photo_alternatives);
 
   // Email
-  markup = gconf_client_get_string (_client, CALENDAR_DIR"/exec", NULL);
+  markup = gconf_client_get_string (_client, MAIL_DIR"/command", NULL);
+  // get the first word on key (the executable name itself)
+  markup = g_strsplit (markup, " ", 0)[0];
   CreateShortcutFromExec (markup, _("Check Email"), _email_alternatives);
   g_free (markup);