aboutsummaryrefslogtreecommitdiff
path: root/src/settings-shared.h
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-29 20:52:37 -0500
committerTed Gould <ted@gould.cx>2011-03-29 20:52:37 -0500
commitc5309d7ec6d6de6683569d88bd17a418a11dbfdf (patch)
treed34e3eab25f3e03bf681e7775d6316abe5a13e86 /src/settings-shared.h
parent7aa23563b3667b313f9f19e3bbace6e794703526 (diff)
parentd455a0cfb2d3f1fd9e244c5db636ad766dcc287d (diff)
downloadayatana-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/settings-shared.h')
-rw-r--r--src/settings-shared.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings-shared.h b/src/settings-shared.h
index cdbb063..1ad4799 100644
--- a/src/settings-shared.h
+++ b/src/settings-shared.h
@@ -34,6 +34,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#define SETTINGS_SHOW_EVENTS_S "show-events"
#define SETTINGS_SHOW_LOCATIONS_S "show-locations"
#define SETTINGS_LOCATIONS_S "locations"
+#define SETTINGS_TIMEZONE_NAME_S "timezone-name"
enum {
SETTINGS_TIME_LOCALE = 0,