Merge lp:~3v1n0/libindicator/shortcut-nicks-startup-notify-13.04 into lp:libindicator/13.04

[Marco Trevisan (Treviño)]

IndicatorDestkopShortcuts: add StartupNotify parameter in our internal fake .desktop file

Otherwise GAppInfo won't pass the relevant platform-data to the Application launched.
Plus, fix the docs.

Backport to 13.04 branch of lp:~3v1n0/libindicator/shortcut-nicks-startup-notify/+merge/157785

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/libindicator-13.04-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-13.04-raring-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libindicator-13.04-raring-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libindicator-13.04-ci/3/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'libindicator/indicator-desktop-shortcuts.c'
--- libindicator/indicator-desktop-shortcuts.c	2013-04-05 11:03:41 +0000
+++ libindicator/indicator-desktop-shortcuts.c	2013-04-09 03:03:22 +0000
@@ -555,9 +555,10 @@
 }
 
 /**
-	indicator_desktop_shortcuts_nick_exec:
+	indicator_desktop_shortcuts_nick_exec_with_context:
 	@ids: The #IndicatorDesktopShortcuts object to look in
 	@nick: Which command that we're referencing.
+	@launch_context: The #GAppLaunchContext to use for launching the shortcut
 
 	Here we take a @nick and try and execute the action that is
 	associated with it.  The @nick parameter should be gotten
@@ -630,9 +631,9 @@
 	gchar * desktopdata = g_strdup_printf("[" G_KEY_FILE_DESKTOP_GROUP "]\n"
 	                                      G_KEY_FILE_DESKTOP_KEY_TYPE "=" G_KEY_FILE_DESKTOP_TYPE_APPLICATION "\n"
 	                                      G_KEY_FILE_DESKTOP_KEY_NAME "=%s\n"
-	                                      G_KEY_FILE_DESKTOP_KEY_EXEC "=%s\n",
-	                                      name, exec);
-	
+	                                      G_KEY_FILE_DESKTOP_KEY_EXEC "=%s\n"
+	                                      G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "=%s\n",
+	                                      name, exec, launch_context ? "true" : "false");
 
 	g_free(name); g_free(exec);
 	/* g_debug("Desktop file: \n%s", desktopdata); */
@@ -653,7 +654,6 @@
 		g_key_file_free(launcher);
 		return FALSE;
 	}
-
 	gboolean launched = g_app_info_launch(G_APP_INFO(appinfo), NULL, launch_context, &error);
 
 	if (error != NULL) {
@@ -669,6 +669,20 @@
 	return launched;
 }
 
+/**
+	indicator_desktop_shortcuts_nick_exec:
+	@ids: The #IndicatorDesktopShortcuts object to look in
+	@nick: Which command that we're referencing.
+
+	Here we take a @nick and try and execute the action that is
+	associated with it.  The @nick parameter should be gotten
+	from #indicator_desktop_shortcuts_get_nicks though it's not
+	required that the exact memory location be the same.
+	This function is deprecated and shouldn't be used in newly
+	written code.
+
+	Return value: #TRUE on success or #FALSE on error.
+*/
 gboolean
 indicator_desktop_shortcuts_nick_exec (IndicatorDesktopShortcuts * ids, const gchar * nick)
 {