Merge lp:~3v1n0/libindicator/launch-shortucts-nicks-with-ctx-13.10 into lp:libindicator/13.10

[Marco Trevisan (Treviño)]

IndicatorDestkopShortcuts: add indicator_desktop_shortcuts_nick_exec_with_context

It allows to pass a GAppLaunchContext to pass platform-data when launching
actions. Deprecate old API.

Same as lp:~3v1n0/libindicator/launch-shortucts-nicks-with-ctx, but with old-API deprecation and whitespace adjustments.

[Lars Karlitski (larsu)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'libindicator/indicator-desktop-shortcuts.c'
--- libindicator/indicator-desktop-shortcuts.c	2012-04-02 23:42:07 +0000
+++ libindicator/indicator-desktop-shortcuts.c	2013-04-05 11:26:42 +0000
@@ -567,7 +567,7 @@
 	Return value: #TRUE on success or #FALSE on error.
 */
 gboolean
-indicator_desktop_shortcuts_nick_exec (IndicatorDesktopShortcuts * ids, const gchar * nick)
+indicator_desktop_shortcuts_nick_exec_with_context (IndicatorDesktopShortcuts * ids, const gchar * nick, GAppLaunchContext * launch_context)
 {
 	GError * error = NULL;
 
@@ -654,7 +654,7 @@
 		return FALSE;
 	}
 
-	gboolean launched = g_app_info_launch(G_APP_INFO(appinfo), NULL, NULL, &error);
+	gboolean launched = g_app_info_launch(G_APP_INFO(appinfo), NULL, launch_context, &error);
 
 	if (error != NULL) {
 		g_warning("Unable to launch file from nick '%s': %s", nick, error->message);
@@ -668,3 +668,9 @@
 
 	return launched;
 }
+
+gboolean
+indicator_desktop_shortcuts_nick_exec (IndicatorDesktopShortcuts * ids, const gchar * nick)
+{
+	return indicator_desktop_shortcuts_nick_exec_with_context (ids, nick, NULL);
+}

=== modified file 'libindicator/indicator-desktop-shortcuts.h'
--- libindicator/indicator-desktop-shortcuts.h	2010-02-15 21:44:00 +0000
+++ libindicator/indicator-desktop-shortcuts.h	2013-04-05 11:26:42 +0000
@@ -24,6 +24,7 @@
 #ifndef __INDICATOR_DESKTOP_SHORTCUTS_H__
 #define __INDICATOR_DESKTOP_SHORTCUTS_H__
 
+#include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
 
@@ -60,14 +61,19 @@
 	GObject parent;
 };
 
-GType                       indicator_desktop_shortcuts_get_type         (void);
-IndicatorDesktopShortcuts * indicator_desktop_shortcuts_new              (const gchar * file,
-                                                                          const gchar * identity);
-const gchar **              indicator_desktop_shortcuts_get_nicks        (IndicatorDesktopShortcuts * ids);
-gchar *                     indicator_desktop_shortcuts_nick_get_name    (IndicatorDesktopShortcuts * ids,
-                                                                          const gchar * nick);
-gboolean                    indicator_desktop_shortcuts_nick_exec        (IndicatorDesktopShortcuts * ids,
-                                                                          const gchar * nick);
+GType                       indicator_desktop_shortcuts_get_type               (void);
+IndicatorDesktopShortcuts * indicator_desktop_shortcuts_new                    (const gchar * file,
+                                                                                const gchar * identity);
+const gchar **              indicator_desktop_shortcuts_get_nicks              (IndicatorDesktopShortcuts * ids);
+gchar *                     indicator_desktop_shortcuts_nick_get_name          (IndicatorDesktopShortcuts * ids,
+                                                                                const gchar * nick);
+gboolean                    indicator_desktop_shortcuts_nick_exec_with_context (IndicatorDesktopShortcuts * ids,
+                                                                                const gchar * nick,
+                                                                                GAppLaunchContext * launch_context);
+
+GLIB_DEPRECATED_FOR(indicator_desktop_shortcuts_nick_exec_with_context)
+gboolean                    indicator_desktop_shortcuts_nick_exec              (IndicatorDesktopShortcuts * ids,
+                                                                                const gchar * nick);
 
 G_END_DECLS