Merge lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime/0.3

[Karl Lattimer]

Two UX bugs from MPT 'sniffles'

[David Barth (dbarth)]

You need to check that evolution is installed before you enable the items. It's ok not to update that when it's installed after the indicator has started or if it gets uninstalled though.

There is an example for that at: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-me/trunk/view/head:/src/me-service.c#L251

review: Needs Fixing

[Karl Lattimer (karl-qdh)]

this is already done a few lines above the diff;

368: datetime-service.c
gchar *evo = g_find_program_in_path("evolution");
 if (evo != NULL) {
  g_debug("Found the calendar application: %s", evo);

[lp:~karl-qdh/indicator-datetime/sniffles]

75. By Karl Lattimer on 2011-03-23

Date and time -> Date and month *sniffles*

76. By Karl Lattimer on 2011-03-23

Removed comma from date time indicator

[David Barth (dbarth)]

LGTM

review: Approve

=== modified file 'data/datetime-dialog.ui'
--- data/datetime-dialog.ui	2011-03-03 13:10:00 +0000
+++ data/datetime-dialog.ui	2011-03-23 12:26:42 +0000
@@ -474,7 +474,7 @@
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="showDateTimeCheck">
-                            <property name="label" translatable="yes">_Date and time</property>
+                            <property name="label" translatable="yes">_Date and month</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
 
=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-03-22 21:38:50 +0000
+++ src/datetime-service.c	2011-03-23 12:26:42 +0000
@@ -371,11 +371,15 @@
 		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
 		dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
 
+		dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+		g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+						  G_CALLBACK (activate_cb), "evolution -c calendar");
+						  
 		events_separator = dbusmenu_menuitem_new();
 		dbusmenu_menuitem_property_set(events_separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
 		dbusmenu_menuitem_child_add_position(root, events_separator, 2);
 		add_appointment = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Appointment"));
+		dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _("Add Event..."));
 		dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
 		g_signal_connect(G_OBJECT(add_appointment), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "evolution -c calendar");
 		dbusmenu_menuitem_child_add_position (root, add_appointment, 3);
 
=== modified file 'src/utils.c'
--- src/utils.c	2011-02-25 14:18:57 +0000
+++ src/utils.c	2011-03-23 12:26:42 +0000
@@ -183,7 +183,7 @@
 	/* TRANSLATORS: This is a format string passed to strftime to combine the
 	   date and the time.  The value of "%s, %s" would result in a string like
 	   this in US English 12-hour time: 'Fri Jul 16, 11:50 AM' */
-	return g_strdup_printf(T_("%s, %s"), date_string, time_string);
+	return g_strdup_printf(T_("%s %s"), date_string, time_string);
 }
 
 gchar *