diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-29 20:52:37 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-29 20:52:37 -0500 |
| commit | c5309d7ec6d6de6683569d88bd17a418a11dbfdf (patch) | |
| tree | d34e3eab25f3e03bf681e7775d6316abe5a13e86 /src/datetime-service.c | |
| parent | 7aa23563b3667b313f9f19e3bbace6e794703526 (diff) | |
| parent | d455a0cfb2d3f1fd9e244c5db636ad766dcc287d (diff) | |
| download | ayatana-indicator-datetime-c5309d7ec6d6de6683569d88bd17a418a11dbfdf.tar.gz ayatana-indicator-datetime-c5309d7ec6d6de6683569d88bd17a418a11dbfdf.tar.bz2 ayatana-indicator-datetime-c5309d7ec6d6de6683569d88bd17a418a11dbfdf.zip | |
* Upstream Merge
* indicator-datetime-preferences crashed with SIGSEGV in
g_utf8_normalize() (LP: #727089)
* Uninstalling Evolution removes calendar from clock applet (LP: #691953)
* clock doesn't update on timezone change (LP: #735445)
* Cannot change main location (LP: #729029)
* indicator-datetime-preferences crashed with SIGSEGV in
g_simple_async_result_complete() (LP: #734951)
* Time zone map looks identical when sensitive vs. insensitive (LP: #740846)
* "Locations" window behaves like a modal dialog (LP: #740924)
* Added location for clock menu isn't used or remembered (LP: #740930)
* Time not displayed for added location in "Locations" window (LP: #740931)
* "UTC" location can be removed but not re-added (LP: #740938)
* "Locations" window bottom bar is missing a border (LP: #740941)
* Add and Remove buttons in "Locations" window have unnecessary tooltips
(LP: #740944)
* No separator between "Add Event" and locations (LP: #740971)
* indicator-datetime-preferences crashed with SIGSEGV in
g_atomic_int_exchange_and_add() (LP: #740978)
* inicator-datetime dosen't show corretly the time when changing from 24
hours format to 12 hours (LP: #743394)
Diffstat (limited to 'src/datetime-service.c')
| -rw-r--r-- | src/datetime-service.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/datetime-service.c b/src/datetime-service.c index 65df77e..905128b 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -364,12 +364,13 @@ static gboolean check_for_calendar (gpointer user_data) { g_return_val_if_fail (calendar != NULL, FALSE); - + // Always enable the calendar even if it does nothing + dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); + dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); + gchar *evo = g_find_program_in_path("evolution"); if (evo != NULL) { g_debug("Found the calendar application: %s", evo); - 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, @@ -437,11 +438,11 @@ update_timezone_menu_items(gpointer user_data) { gboolean show = g_settings_get_boolean (conf, SETTINGS_SHOW_LOCATIONS_S); - if (len > 0) { - dbusmenu_menuitem_property_set_bool (locations_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, show); - dbusmenu_menuitem_property_set_bool (current_location, DBUSMENU_MENUITEM_PROP_VISIBLE, show); - dbusmenu_menuitem_property_set_bool (current_location, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); - } else { + dbusmenu_menuitem_property_set_bool (locations_separator, DBUSMENU_MENUITEM_PROP_VISIBLE, show); + dbusmenu_menuitem_property_set_bool (current_location, DBUSMENU_MENUITEM_PROP_VISIBLE, show); + dbusmenu_menuitem_property_set_bool (current_location, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); + + if (len == 0) { g_debug("No locations configured (Empty List)"); return FALSE; } |