date-selector: completely drop the format_24h flag
Dates do not depend on the time format, so it shouldn't be cached here.
This commit is contained in:
committed by
Erick Pérez Castellanos
parent
9b5670a416
commit
5cec73ab43
@@ -51,8 +51,6 @@ struct _GcalDateSelectorPrivate
|
|||||||
guint month_pos;
|
guint month_pos;
|
||||||
guint year_pos;
|
guint year_pos;
|
||||||
gboolean have_long_year;
|
gboolean have_long_year;
|
||||||
|
|
||||||
gboolean format_24h;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -340,8 +338,6 @@ gcal_date_selector_constructed (GObject *object)
|
|||||||
GtkWidget *label;
|
GtkWidget *label;
|
||||||
GtkBuilder *builder;
|
GtkBuilder *builder;
|
||||||
|
|
||||||
GSettings *settings;
|
|
||||||
gchar *clock_format;
|
|
||||||
gchar *entry_name;
|
gchar *entry_name;
|
||||||
|
|
||||||
priv = gcal_date_selector_get_instance_private (GCAL_DATE_SELECTOR (object));
|
priv = gcal_date_selector_get_instance_private (GCAL_DATE_SELECTOR (object));
|
||||||
@@ -349,14 +345,6 @@ gcal_date_selector_constructed (GObject *object)
|
|||||||
/* chaining up */
|
/* chaining up */
|
||||||
G_OBJECT_CLASS (gcal_date_selector_parent_class)->constructed (object);
|
G_OBJECT_CLASS (gcal_date_selector_parent_class)->constructed (object);
|
||||||
|
|
||||||
/* 24h setting */
|
|
||||||
settings = g_settings_new ("org.gnome.desktop.interface");
|
|
||||||
clock_format = g_settings_get_string (settings, "clock-format");
|
|
||||||
priv->format_24h = (g_strcmp0 (clock_format, "24h") == 0);
|
|
||||||
|
|
||||||
g_free (clock_format);
|
|
||||||
g_object_unref (settings);
|
|
||||||
|
|
||||||
/* date label */
|
/* date label */
|
||||||
priv->date_label = gtk_label_new (NULL);
|
priv->date_label = gtk_label_new (NULL);
|
||||||
gtk_widget_show (priv->date_label);
|
gtk_widget_show (priv->date_label);
|
||||||
@@ -446,21 +434,6 @@ gcal_date_selector_new (void)
|
|||||||
return g_object_new (GCAL_TYPE_DATE_SELECTOR, NULL);
|
return g_object_new (GCAL_TYPE_DATE_SELECTOR, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
gcal_date_selector_use_24h_format (GcalDateSelector *selector,
|
|
||||||
gboolean use_24h_format)
|
|
||||||
{
|
|
||||||
GcalDateSelectorPrivate *priv;
|
|
||||||
|
|
||||||
g_return_if_fail (GCAL_IS_DATE_SELECTOR (selector));
|
|
||||||
priv = gcal_date_selector_get_instance_private (selector);
|
|
||||||
|
|
||||||
priv->format_24h = use_24h_format;
|
|
||||||
|
|
||||||
/* update values */
|
|
||||||
gcal_date_selector_set_date (selector, priv->day, priv->month, priv->year);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
gcal_date_selector_set_date (GcalDateSelector *selector,
|
gcal_date_selector_set_date (GcalDateSelector *selector,
|
||||||
gint day,
|
gint day,
|
||||||
|
|||||||
@@ -54,9 +54,6 @@ GType gcal_date_selector_get_type (void);
|
|||||||
|
|
||||||
GtkWidget* gcal_date_selector_new (void);
|
GtkWidget* gcal_date_selector_new (void);
|
||||||
|
|
||||||
void gcal_date_selector_use_24h_format (GcalDateSelector *selector,
|
|
||||||
gboolean use_24h_format);
|
|
||||||
|
|
||||||
void gcal_date_selector_set_date (GcalDateSelector *selector,
|
void gcal_date_selector_set_date (GcalDateSelector *selector,
|
||||||
gint day,
|
gint day,
|
||||||
gint month,
|
gint month,
|
||||||
|
|||||||
Reference in New Issue
Block a user