diff options
| author | karl-qdh <karl@qdh.org.uk> | 2011-03-23 15:03:46 +0000 |
|---|---|---|
| committer | karl-qdh <karl@qdh.org.uk> | 2011-03-23 15:03:46 +0000 |
| commit | 438f4a55d549ae766be9add0e91bad5776b85130 (patch) | |
| tree | 3e3899660087eb1fc0e508a5b0c7f1f61a4854b8 /src/datetime-service.c | |
| parent | f436da0a3f8cf7a01ccb0ae062d53e5be6cd5ff8 (diff) | |
| parent | 74fe3165a907c7e7948c7a2066188eda2f234b59 (diff) | |
| download | ayatana-indicator-datetime-438f4a55d549ae766be9add0e91bad5776b85130.tar.gz ayatana-indicator-datetime-438f4a55d549ae766be9add0e91bad5776b85130.tar.bz2 ayatana-indicator-datetime-438f4a55d549ae766be9add0e91bad5776b85130.zip | |
merged back with sniffles branch and added some changes to the resetdate, which also effects the marked days.
Diffstat (limited to 'src/datetime-service.c')
| -rw-r--r-- | src/datetime-service.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c index 129ec14..17745fe 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -47,8 +47,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libical/icaltime.h> #include <cairo/cairo.h> -#include <oobs/oobs-timeconfig.h> - #include "datetime-interface.h" #include "dbus-shared.h" #include "settings-shared.h" @@ -254,8 +252,8 @@ update_datetime (gpointer user_data) return FALSE; } - /* Note: may require some localization tweaks */ - strftime(longstr, 128, "%A, %e %B %Y", ltime); + /* Translators: strftime(3) style date format on top of the menu when you click on the clock */ + strftime(longstr, 128, _("%A, %e %B %Y"), ltime); gchar * utf8 = g_locale_to_utf8(longstr, -1, NULL, NULL, NULL); dbusmenu_menuitem_property_set(date, DBUSMENU_MENUITEM_PROP_LABEL, utf8); @@ -322,6 +320,7 @@ static gboolean close_menu_cb (DbusmenuMenuitem * menuitem, gchar *name, GVariant *variant) { if (calendar == NULL) return FALSE; + g_debug("Resetting date on menu close"); start_time_appointments = 0; // TODO create a variant which will be an array of 3 ints {y,m,d} GVariant *date_variant; @@ -394,11 +393,15 @@ check_for_calendar (gpointer user_data) 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); |