diff options
| author | Michael Terry <mike@mterry.name> | 2011-03-01 15:33:47 -0500 |
|---|---|---|
| committer | Michael Terry <mike@mterry.name> | 2011-03-01 15:33:47 -0500 |
| commit | ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57 (patch) | |
| tree | 4dc39c5d885db1041a93b7024a1d4e754c9c7b42 /src/datetime-prefs.c | |
| parent | 486ad3625ca52b318f5514f782b90f1eda0b87e7 (diff) | |
| parent | b79665734363a3644d3eb7b13a110908ac05d3a1 (diff) | |
| download | ayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.tar.gz ayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.tar.bz2 ayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.zip | |
merge from trunk
Diffstat (limited to 'src/datetime-prefs.c')
| -rw-r--r-- | src/datetime-prefs.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index d053c7e..c71217a 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -91,45 +91,6 @@ bind_hours_get (GValue * value, GVariant * variant, gpointer user_data) return TRUE; } -/* Turns the boolean property into a string gsettings */ -static GVariant * -bind_week_start_set (const GValue * value, const GVariantType * type, gpointer user_data) -{ - const gchar * output = NULL; - gboolean is_sunday_button = (gboolean)GPOINTER_TO_INT(user_data); - - if (g_value_get_boolean(value)) { - /* Only do anything if we're setting active = true */ - output = is_sunday_button ? "sunday" : "monday"; - } else { - return NULL; - } - - return g_variant_new_string (output); -} - -/* Turns a string gsettings into a boolean property */ -static gboolean -bind_week_start_get (GValue * value, GVariant * variant, gpointer user_data) -{ - const gchar * str = g_variant_get_string(variant, NULL); - gboolean output = FALSE; - gboolean is_sunday_button = (gboolean)GPOINTER_TO_INT(user_data); - - if (g_strcmp0(str, "locale-default") == 0) { - output = (is_sunday_button == is_locale_week_start_sunday ()); - } else if (g_strcmp0(str, "sunday") == 0) { - output = is_sunday_button; - } else if (g_strcmp0(str, "monday") == 0) { - output = !is_sunday_button; - } else { - return FALSE; - } - - g_value_set_boolean (value, output); - return TRUE; -} - static void widget_dependency_cb (GtkWidget * parent, GParamSpec *pspec, GtkWidget * dependent) { @@ -588,16 +549,6 @@ create_dialog (void) "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind (conf, SETTINGS_SHOW_WEEK_NUMBERS_S, WIG ("includeWeekNumbersCheck"), "active", G_SETTINGS_BIND_DEFAULT); - g_settings_bind_with_mapping (conf, SETTINGS_WEEK_START_S, - WIG ("startOnSundayRadio"), "active", - G_SETTINGS_BIND_DEFAULT, - bind_week_start_get, bind_week_start_set, - GINT_TO_POINTER(TRUE), NULL); - g_settings_bind_with_mapping (conf, SETTINGS_WEEK_START_S, - WIG ("startOnMondayRadio"), "active", - G_SETTINGS_BIND_DEFAULT, - bind_week_start_get, bind_week_start_set, - GINT_TO_POINTER(FALSE), NULL); g_settings_bind (conf, SETTINGS_SHOW_EVENTS_S, WIG ("showEventsCheck"), "active", G_SETTINGS_BIND_DEFAULT); g_settings_bind (conf, SETTINGS_SHOW_LOCATIONS_S, WIG ("showLocationsCheck"), |