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

[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.

Added indicator_desktop_shortcuts_nick_exec_with_context function to indicator-desktop-shortcuts, not to break the API I've kept the old indicator_desktop_shortcuts_nick_exec, that now only calls indicator_desktop_shortcuts_nick_exec_with_context with a NULL context (as it was doing before).
Now we'll be able to use the correct context in unity, though.

This is merging only with 13.04 branch, let me know if it's the case to propose this for trunk as well or not.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Thanks! This is definitely a change worth having in trunk as well.

Just one problem: you renamed the original function to indicator_desktop_shortcuts_nick_exec_ctx. Probably by accident?

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

> Thanks! This is definitely a change worth having in trunk as well.

Nice, for trunk I'd like to set the old one as deprecated though.
(or to be removed at all, since we're using it only in unity AFAIK)

> Just one problem: you renamed the original function to
> indicator_desktop_shortcuts_nick_exec_ctx. Probably by accident?

Ooops, sorry for this, fixed!

[lp:~3v1n0/libindicator/launch-shortucts-nicks-with-ctx]

484. By Marco Trevisan (Treviño) on 2013-04-05

IndicatorDestkopShortcuts: fixed typo

485. By Marco Trevisan (Treviño) on 2013-04-05

IndicatorDestkopShortcuts: add missing include

[Lars Karlitski (larsu)]

Cool, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libindicator-13.04-ci/2/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:23:33 +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:23:33 +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>
 
@@ -66,6 +67,9 @@
 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);
 gboolean                    indicator_desktop_shortcuts_nick_exec        (IndicatorDesktopShortcuts * ids,
                                                                           const gchar * nick);