Merge lp:~davidmhewitt/wingpanel-indicator-datetime/fix-1629692 into lp:~wingpanel-devs/wingpanel-indicator-datetime/trunk

[David Hewitt]

Resolve a hang when maya-calendar is not installed

Resolves the hang when maya-calendar is not installed. Must have been an issue with the SimpleCommand.run() function as no exceptions are thrown with it, it just hangs.

execute_command works as intended.

[Adam Bieńkowski (donadigo)]

We should use GLib's AppInfo instead.

review: Disapprove (code)

[David Hewitt (davidmhewitt)]

> We should use GLib's AppInfo instead.

I agree. However, this would disable the functionality of launching the calendar on the date you double clicked on. Should this be removed to be more compatible with other calendar applications?

[Adam Bieńkowski (donadigo)]

> > We should use GLib's AppInfo instead.
>
> I agree. However, this would disable the functionality of launching the
> calendar on the date you double clicked on. Should this be removed to be more
> compatible with other calendar applications?

I'm not talking about other applications here. You can just use something like this:
var app_info = AppInfo.create_from_commandline ("maya-calendar", null, AppInfoCreateFlags.NONE);
app_info.launch_uris (`your arguments here`, null);

This is the native method of executing apps with GLib, rather than using the command line, and if maya doesn't exist handle the error just by using error ().

[David Hewitt (davidmhewitt)]

> > > We should use GLib's AppInfo instead.
> >
> > I agree. However, this would disable the functionality of launching the
> > calendar on the date you double clicked on. Should this be removed to be
> more
> > compatible with other calendar applications?
>
> I'm not talking about other applications here. You can just use something like
> this:
> var app_info = AppInfo.create_from_commandline ("maya-calendar", null,
> AppInfoCreateFlags.NONE);
> app_info.launch_uris (`your arguments here`, null);
>
> This is the native method of executing apps with GLib, rather than using the
> command line, and if maya doesn't exist handle the error just by using error
> ().

Thank you for the info. I've just tried the launch_uris method and while maya-calendar launches fine, it isn't possible to get it to open on the clicked date. I've tried splitting the arguments up in various ways to pass into launch_uris.

I would assume that the launch_uris method is ignoring things that aren't valid URIs and not passing them to maya-calendar. Something of the format of "--show-day 01/01/2017" isn't a valid URI and without doing some work on maya-calendar, we can't pass the date we want as a URI either.

[Vishal Rao (vishalrao)]

Is it not possible to do AppInfo.create_from_commandline ("maya-calendar --show-day 01/01/2017"...) then launch_uris (null, null) ?

[Adam Bieńkowski (donadigo)]

Yeah, probably that could work ^^

[lp:~davidmhewitt/wingpanel-indicator-datetime/fix-1629692]

176. By David Hewitt on 2017-02-10

Switch to using AppInfo to launch maya

[David Hewitt (davidmhewitt)]

Thanks, not sure why I didn't think of that while I was trying all the combinations of launching with AppInfo. Should be ready to go now.

review: Needs Resubmitting

=== modified file 'src/Widgets/calendar/Calendar.vala'
--- src/Widgets/calendar/Calendar.vala	2016-01-07 14:46:41 +0000
+++ src/Widgets/calendar/Calendar.vala	2017-02-10 19:47:02 +0000
@@ -69,10 +69,13 @@
             selected_day= date.get_day_of_month ();
 
             var parameter_string = @" --show-day $selected_day/$selected_month/$selected_year";
-            var command = CALENDAR_EXEC + parameter_string;
-
-            var cmd = new Granite.Services.SimpleCommand ("/usr/bin", command);
-            cmd.run ();
+            try {
+                var appinfo = AppInfo.create_from_commandline (CALENDAR_EXEC + parameter_string, null, AppInfoCreateFlags.NONE);
+                appinfo.launch_uris (null, null);
+            } catch (GLib.Error e) {
+                warning ("Unable to start calendar, error: %s", e.message);
+            }
+            
         }
 
         public override bool draw (Cairo.Context cr) {
@@ -97,4 +100,4 @@
             return false;
         }
     }
-}
\ No newline at end of file
+}