From e779a309274152dc0104b8acd0f0129713454d4f Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 26 Sep 2017 20:20:32 -0400 Subject: [PATCH] datetime: Use G_DEFINE_TYPE --- panels/datetime/cc-datetime-panel.c | 340 +++++++++++++--------------- panels/datetime/cc-datetime-panel.h | 41 +--- panels/datetime/cc-timezone-map.c | 197 ++++++++-------- panels/datetime/cc-timezone-map.h | 41 +--- 4 files changed, 253 insertions(+), 366 deletions(-) diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c index 5500b0503..8d987210a 100644 --- a/panels/datetime/cc-datetime-panel.c +++ b/panels/datetime/cc-datetime-panel.c @@ -45,18 +45,13 @@ #define DEFAULT_TZ "Europe/London" #define GETTEXT_PACKAGE_TIMEZONES GETTEXT_PACKAGE "-timezones" -CC_PANEL_REGISTER (CcDateTimePanel, cc_date_time_panel) - -#define DATE_TIME_PANEL_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_DATE_TIME_PANEL, CcDateTimePanelPrivate)) - enum { CITY_COL_CITY_HUMAN_READABLE, CITY_COL_ZONE, CITY_NUM_COLS }; -#define W(x) (GtkWidget*) gtk_builder_get_object (priv->builder, x) +#define W(x) (GtkWidget*) gtk_builder_get_object (self->builder, x) #define DATETIME_PERMISSION "org.gnome.controlcenter.datetime.configure" @@ -68,8 +63,10 @@ enum { #define DATETIME_SCHEMA "org.gnome.desktop.datetime" #define AUTO_TIMEZONE_KEY "automatic-timezone" -struct _CcDateTimePanelPrivate +struct _CcDateTimePanel { + CcPanel parent_instance; + GtkBuilder *builder; GtkWidget *map; @@ -100,6 +97,8 @@ struct _CcDateTimePanelPrivate GPermission *permission; }; +CC_PANEL_REGISTER (CcDateTimePanel, cc_date_time_panel) + static void update_time (CcDateTimePanel *self); static void change_time (CcDateTimePanel *self); @@ -107,39 +106,39 @@ static void change_time (CcDateTimePanel *self); static void cc_date_time_panel_dispose (GObject *object) { - CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (object)->priv; + CcDateTimePanel *panel = CC_DATE_TIME_PANEL (object); - if (priv->cancellable) + if (panel->cancellable) { - g_cancellable_cancel (priv->cancellable); - g_clear_object (&priv->cancellable); + g_cancellable_cancel (panel->cancellable); + g_clear_object (&panel->cancellable); } - if (priv->am_pm_visiblity_changed_id != 0) + if (panel->am_pm_visiblity_changed_id != 0) { - g_signal_handler_disconnect (priv->am_pm_stack, - priv->am_pm_visiblity_changed_id); - priv->am_pm_visiblity_changed_id = 0; + g_signal_handler_disconnect (panel->am_pm_stack, + panel->am_pm_visiblity_changed_id); + panel->am_pm_visiblity_changed_id = 0; } - if (priv->toplevels) + if (panel->toplevels) { - g_list_free_full (priv->toplevels, (GDestroyNotify) gtk_widget_destroy); - priv->toplevels = NULL; + g_list_free_full (panel->toplevels, (GDestroyNotify) gtk_widget_destroy); + panel->toplevels = NULL; } - g_clear_object (&priv->builder); - g_clear_object (&priv->clock_tracker); - g_clear_object (&priv->dtm); - g_clear_object (&priv->permission); - g_clear_object (&priv->clock_settings); - g_clear_object (&priv->datetime_settings); - g_clear_object (&priv->filechooser_settings); + g_clear_object (&panel->builder); + g_clear_object (&panel->clock_tracker); + g_clear_object (&panel->dtm); + g_clear_object (&panel->permission); + g_clear_object (&panel->clock_settings); + g_clear_object (&panel->datetime_settings); + g_clear_object (&panel->filechooser_settings); - g_clear_pointer (&priv->date, g_date_time_unref); + g_clear_pointer (&panel->date, g_date_time_unref); - g_clear_pointer (&priv->listboxes, g_list_free); - g_clear_pointer (&priv->listboxes_reverse, g_list_free); + g_clear_pointer (&panel->listboxes, g_list_free); + g_clear_pointer (&panel->listboxes_reverse, g_list_free); G_OBJECT_CLASS (cc_date_time_panel_parent_class)->dispose (object); } @@ -147,9 +146,8 @@ cc_date_time_panel_dispose (GObject *object) static GPermission * cc_date_time_panel_get_permission (CcPanel *panel) { - CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (panel)->priv; - - return priv->permission; + CcDateTimePanel *self = CC_DATE_TIME_PANEL (panel); + return self->permission; } static const char * @@ -164,8 +162,6 @@ cc_date_time_panel_class_init (CcDateTimePanelClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); CcPanelClass *panel_class = CC_PANEL_CLASS (klass); - g_type_class_add_private (klass, sizeof (CcDateTimePanelPrivate)); - object_class->dispose = cc_date_time_panel_dispose; panel_class->get_permission = cc_date_time_panel_get_permission; @@ -181,14 +177,13 @@ static void clock_settings_changed_cb (GSettings *settings, static void change_clock_settings (GObject *gobject, GParamSpec *pspec, - CcDateTimePanel *panel) + CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = panel->priv; GDesktopClockFormat value; const char *active_id; - g_signal_handlers_block_by_func (priv->clock_settings, clock_settings_changed_cb, - panel); + g_signal_handlers_block_by_func (self->clock_settings, clock_settings_changed_cb, + self); active_id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (W ("format_combobox"))); if (!g_strcmp0 (active_id, "24h")) @@ -196,46 +191,44 @@ change_clock_settings (GObject *gobject, else value = G_DESKTOP_CLOCK_FORMAT_12H; - g_settings_set_enum (priv->clock_settings, CLOCK_FORMAT_KEY, value); - g_settings_set_enum (priv->filechooser_settings, CLOCK_FORMAT_KEY, value); - priv->clock_format = value; + g_settings_set_enum (self->clock_settings, CLOCK_FORMAT_KEY, value); + g_settings_set_enum (self->filechooser_settings, CLOCK_FORMAT_KEY, value); + self->clock_format = value; - update_time (panel); + update_time (self); - g_signal_handlers_unblock_by_func (priv->clock_settings, clock_settings_changed_cb, - panel); + g_signal_handlers_unblock_by_func (self->clock_settings, clock_settings_changed_cb, + self); } static void clock_settings_changed_cb (GSettings *settings, gchar *key, - CcDateTimePanel *panel) + CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = panel->priv; GtkWidget *format_combo; GDesktopClockFormat value; value = g_settings_get_enum (settings, CLOCK_FORMAT_KEY); - priv->clock_format = value; + self->clock_format = value; format_combo = W ("format_combobox"); - g_signal_handlers_block_by_func (format_combo, change_clock_settings, panel); + g_signal_handlers_block_by_func (format_combo, change_clock_settings, self); if (value == G_DESKTOP_CLOCK_FORMAT_24H) gtk_combo_box_set_active_id (GTK_COMBO_BOX (format_combo), "24h"); else gtk_combo_box_set_active_id (GTK_COMBO_BOX (format_combo), "12h"); - update_time (panel); + update_time (self); - g_signal_handlers_unblock_by_func (format_combo, change_clock_settings, panel); + g_signal_handlers_unblock_by_func (format_combo, change_clock_settings, self); } static void am_pm_stack_visible_child_changed_cb (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; AtkObject *am_pm_button_accessible; GtkWidget *visible_label; const gchar *visible_text; @@ -244,7 +237,7 @@ am_pm_stack_visible_child_changed_cb (CcDateTimePanel *self) if (am_pm_button_accessible == NULL) return; - visible_label = gtk_stack_get_visible_child (GTK_STACK (priv->am_pm_stack)); + visible_label = gtk_stack_get_visible_child (GTK_STACK (self->am_pm_stack)); visible_text = gtk_label_get_text (GTK_LABEL (visible_label)); atk_object_set_name (am_pm_button_accessible, visible_text); } @@ -253,14 +246,13 @@ static gboolean am_pm_button_clicked (GtkWidget *button, CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; GtkWidget *visible_child; - visible_child = gtk_stack_get_visible_child (GTK_STACK (priv->am_pm_stack)); - if (visible_child == priv->am_label) - gtk_stack_set_visible_child (GTK_STACK (priv->am_pm_stack), priv->pm_label); + visible_child = gtk_stack_get_visible_child (GTK_STACK (self->am_pm_stack)); + if (visible_child == self->am_label) + gtk_stack_set_visible_child (GTK_STACK (self->am_pm_stack), self->pm_label); else - gtk_stack_set_visible_child (GTK_STACK (priv->am_pm_stack), priv->am_label); + gtk_stack_set_visible_child (GTK_STACK (self->am_pm_stack), self->am_label); change_time (self); @@ -271,7 +263,6 @@ am_pm_button_clicked (GtkWidget *button, static void update_time (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; GtkWidget *h_spinbutton; GtkWidget *m_spinbutton; GtkWidget *am_pm_button; @@ -288,13 +279,13 @@ update_time (CcDateTimePanel *self) g_signal_handlers_block_by_func (m_spinbutton, change_time, self); g_signal_handlers_block_by_func (am_pm_button, am_pm_button_clicked, self); - if (priv->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) + if (self->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) use_ampm = TRUE; else use_ampm = FALSE; - hour = g_date_time_get_hour (priv->date); - minute = g_date_time_get_minute (priv->date); + hour = g_date_time_get_hour (self->date); + minute = g_date_time_get_minute (self->date); if (!use_ampm) { @@ -310,9 +301,9 @@ update_time (CcDateTimePanel *self) /* Update the AM/PM button */ if (is_pm_time) - gtk_stack_set_visible_child (GTK_STACK (priv->am_pm_stack), priv->pm_label); + gtk_stack_set_visible_child (GTK_STACK (self->am_pm_stack), self->pm_label); else - gtk_stack_set_visible_child (GTK_STACK (priv->am_pm_stack), priv->am_label); + gtk_stack_set_visible_child (GTK_STACK (self->am_pm_stack), self->am_label); /* Update the hours spinbutton */ if (is_pm_time) @@ -336,12 +327,12 @@ update_time (CcDateTimePanel *self) if (use_ampm) { /* Translators: This is the full date and time format used in 12-hour mode. */ - label = g_date_time_format (priv->date, _("%e %B %Y, %l:%M %p")); + label = g_date_time_format (self->date, _("%e %B %Y, %l:%M %p")); } else { /* Translators: This is the full date and time format used in 24-hour mode. */ - label = g_date_time_format (priv->date, _("%e %B %Y, %R")); + label = g_date_time_format (self->date, _("%e %B %Y, %R")); } gtk_label_set_text (GTK_LABEL (W ("datetime_label")), label); @@ -357,7 +348,7 @@ set_time_cb (GObject *source, GError *error; error = NULL; - if (!timedate1_call_set_time_finish (self->priv->dtm, + if (!timedate1_call_set_time_finish (self->dtm, res, &error)) { @@ -380,7 +371,7 @@ set_timezone_cb (GObject *source, GError *error; error = NULL; - if (!timedate1_call_set_timezone_finish (self->priv->dtm, + if (!timedate1_call_set_timezone_finish (self->dtm, res, &error)) { @@ -399,7 +390,7 @@ set_using_ntp_cb (GObject *source, GError *error; error = NULL; - if (!timedate1_call_set_ntp_finish (self->priv->dtm, + if (!timedate1_call_set_ntp_finish (self->dtm, res, &error)) { @@ -415,13 +406,13 @@ queue_set_datetime (CcDateTimePanel *self) gint64 unixtime; /* timedated expects number of microseconds since 1 Jan 1970 UTC */ - unixtime = g_date_time_to_unix (self->priv->date); + unixtime = g_date_time_to_unix (self->date); - timedate1_call_set_time (self->priv->dtm, + timedate1_call_set_time (self->dtm, unixtime * 1000000, FALSE, TRUE, - self->priv->cancellable, + self->cancellable, set_time_cb, self); } @@ -429,15 +420,14 @@ queue_set_datetime (CcDateTimePanel *self) static void queue_set_ntp (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; gboolean using_ntp; /* for now just do it */ using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch"))); - timedate1_call_set_ntp (self->priv->dtm, + timedate1_call_set_ntp (self->dtm, using_ntp, TRUE, - self->priv->cancellable, + self->cancellable, set_using_ntp_cb, self); } @@ -446,12 +436,12 @@ static void queue_set_timezone (CcDateTimePanel *self) { /* for now just do it */ - if (self->priv->current_location) + if (self->current_location) { - timedate1_call_set_timezone (self->priv->dtm, - self->priv->current_location->zone, + timedate1_call_set_timezone (self->dtm, + self->current_location->zone, TRUE, - self->priv->cancellable, + self->cancellable, set_timezone_cb, self); } @@ -460,17 +450,16 @@ queue_set_timezone (CcDateTimePanel *self) static void change_date (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; guint mon, y, d; GDateTime *old_date; - old_date = priv->date; + old_date = self->date; mon = 1 + gtk_combo_box_get_active (GTK_COMBO_BOX (W ("month-combobox"))); y = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (W ("year-spinbutton"))); d = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (W ("day-spinbutton"))); - priv->date = g_date_time_new_local (y, mon, d, + self->date = g_date_time_new_local (y, mon, d, g_date_time_get_hour (old_date), g_date_time_get_minute (old_date), g_date_time_get_second (old_date)); @@ -489,7 +478,7 @@ city_changed_cb (GtkEntryCompletion *entry_completion, gtk_tree_model_get (model, iter, CITY_COL_ZONE, &zone, -1); - cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->priv->map), zone); + cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->map), zone); g_free (zone); entry = gtk_entry_completion_get_entry (GTK_ENTRY_COMPLETION (entry_completion)); @@ -531,7 +520,6 @@ translated_city_name (TzLocation *loc) static void update_timezone (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; char *bubble_text; char *city_country; char *label; @@ -540,40 +528,40 @@ update_timezone (CcDateTimePanel *self) char *tz_desc; gboolean use_ampm; - if (priv->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) + if (self->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) use_ampm = TRUE; else use_ampm = FALSE; - city_country = translated_city_name (priv->current_location); + city_country = translated_city_name (self->current_location); /* Update the timezone on the listbow row */ /* Translators: "timezone (details)" */ label = g_strdup_printf (C_("timezone desc", "%s (%s)"), - g_date_time_get_timezone_abbreviation (self->priv->date), + g_date_time_get_timezone_abbreviation (self->date), city_country); gtk_label_set_text (GTK_LABEL (W ("timezone_label")), label); g_free (label); /* Translators: UTC here means the Coordinated Universal Time. * %:::z will be replaced by the offset from UTC e.g. UTC+02 */ - utc_label = g_date_time_format (priv->date, _("UTC%:::z")); + utc_label = g_date_time_format (self->date, _("UTC%:::z")); if (use_ampm) { /* Translators: This is the time format used in 12-hour mode. */ - time_label = g_date_time_format (priv->date, _("%l:%M %p")); + time_label = g_date_time_format (self->date, _("%l:%M %p")); } else { /* Translators: This is the time format used in 24-hour mode. */ - time_label = g_date_time_format (priv->date, _("%R")); + time_label = g_date_time_format (self->date, _("%R")); } /* Update the text bubble in the timezone map */ /* Translators: "timezone (utc shift)" */ tz_desc = g_strdup_printf (C_("timezone map", "%s (%s)"), - g_date_time_get_timezone_abbreviation (self->priv->date), + g_date_time_get_timezone_abbreviation (self->date), utc_label); bubble_text = g_strdup_printf ("%s\n" "%s\n" @@ -581,7 +569,7 @@ update_timezone (CcDateTimePanel *self) tz_desc, city_country, time_label); - cc_timezone_map_set_bubble_text (CC_TIMEZONE_MAP (priv->map), bubble_text); + cc_timezone_map_set_bubble_text (CC_TIMEZONE_MAP (self->map), bubble_text); g_free (tz_desc); g_free (bubble_text); @@ -595,18 +583,17 @@ location_changed_cb (CcTimezoneMap *map, TzLocation *location, CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; GDateTime *old_date; GTimeZone *timezone; g_debug ("location changed to %s/%s", location->country, location->zone); - priv->current_location = location; + self->current_location = location; - old_date = priv->date; + old_date = self->date; timezone = g_time_zone_new (location->zone); - priv->date = g_date_time_to_timezone (old_date, timezone); + self->date = g_date_time_to_timezone (old_date, timezone); g_time_zone_unref (timezone); g_date_time_unref (old_date); @@ -620,15 +607,15 @@ get_initial_timezone (CcDateTimePanel *self) { const gchar *timezone; - timezone = timedate1_get_timezone (self->priv->dtm); + timezone = timedate1_get_timezone (self->dtm); if (timezone == NULL || - !cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->priv->map), timezone)) + !cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->map), timezone)) { g_warning ("Timezone '%s' is unhandled, setting %s as default", timezone ? timezone : "(null)", DEFAULT_TZ); - cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->priv->map), DEFAULT_TZ); + cc_timezone_map_set_timezone (CC_TIMEZONE_MAP (self->map), DEFAULT_TZ); } - self->priv->current_location = cc_timezone_map_get_location (CC_TIMEZONE_MAP (self->priv->map)); + self->current_location = cc_timezone_map_get_location (CC_TIMEZONE_MAP (self->map)); update_timezone (self); } @@ -665,9 +652,8 @@ day_changed (GtkWidget *widget, static void month_year_changed (GtkWidget *widget, - CcDateTimePanel *panel) + CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = panel->priv; guint mon, y; guint num_days; GtkAdjustment *adj; @@ -686,7 +672,7 @@ month_year_changed (GtkWidget *widget, if (gtk_spin_button_get_value_as_int (day_spin) > num_days) gtk_spin_button_set_value (day_spin, num_days); - change_date (panel); + change_date (self); } static void @@ -694,33 +680,30 @@ on_clock_changed (GnomeWallClock *clock, GParamSpec *pspec, CcDateTimePanel *panel) { - CcDateTimePanelPrivate *priv = panel->priv; - - g_date_time_unref (priv->date); - priv->date = g_date_time_new_now_local (); + g_date_time_unref (panel->date); + panel->date = g_date_time_new_now_local (); update_time (panel); update_timezone (panel); } static void -change_time (CcDateTimePanel *panel) +change_time (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = panel->priv; guint h, m; GDateTime *old_date; - old_date = priv->date; + old_date = self->date; h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (W ("h_spinbutton"))); m = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (W ("m_spinbutton"))); - if (priv->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) + if (self->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) { gboolean is_pm_time; GtkWidget *visible_child; - visible_child = gtk_stack_get_visible_child (GTK_STACK (priv->am_pm_stack)); - if (visible_child == priv->pm_label) + visible_child = gtk_stack_get_visible_child (GTK_STACK (self->am_pm_stack)); + if (visible_child == self->pm_label) is_pm_time = TRUE; else is_pm_time = FALSE; @@ -731,15 +714,15 @@ change_time (CcDateTimePanel *panel) h += 12; } - priv->date = g_date_time_new_local (g_date_time_get_year (old_date), + self->date = g_date_time_new_local (g_date_time_get_year (old_date), g_date_time_get_month (old_date), g_date_time_get_day_of_month (old_date), h, m, g_date_time_get_second (old_date)); g_date_time_unref (old_date); - update_time (panel); - queue_set_datetime (panel); + update_time (self); + queue_set_datetime (self); } static void @@ -759,7 +742,7 @@ is_ntp_available (CcDateTimePanel *self) /* We need to access this directly so that we can default to TRUE if * it is not set. */ - value = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (self->priv->dtm), "CanNTP"); + value = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (self->dtm), "CanNTP"); if (value) { if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN)) @@ -775,10 +758,10 @@ on_permission_changed (GPermission *permission, GParamSpec *pspec, gpointer data) { - CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv; + CcDateTimePanel *self = CC_DATE_TIME_PANEL (data); gboolean allowed, auto_timezone, using_ntp; - allowed = (priv->permission != NULL && g_permission_get_allowed (priv->permission)); + allowed = (self->permission != NULL && g_permission_get_allowed (self->permission)); using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch"))); auto_timezone = gtk_switch_get_active (GTK_SWITCH (W("auto_timezone_switch"))); @@ -799,16 +782,15 @@ on_permission_changed (GPermission *permission, static void on_can_ntp_changed (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; gtk_widget_set_visible (W ("auto-datetime-row"), is_ntp_available (self)); } static void on_timezone_changed (CcDateTimePanel *self) { - g_signal_handlers_block_by_func (self->priv->map, location_changed_cb, self); + g_signal_handlers_block_by_func (self->map, location_changed_cb, self); get_initial_timezone (self); - g_signal_handlers_unblock_by_func (self->priv->map, location_changed_cb, self); + g_signal_handlers_unblock_by_func (self->map, location_changed_cb, self); } static void @@ -849,14 +831,13 @@ keynav_failed (GtkWidget *listbox, GtkDirectionType direction, CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; GList *item, *listboxes; /* Find the listbox in the list of GtkListBoxes */ if (direction == GTK_DIR_DOWN) - listboxes = priv->listboxes; + listboxes = self->listboxes; else - listboxes = priv->listboxes_reverse; + listboxes = self->listboxes_reverse; item = g_list_find (listboxes, listbox); g_assert (item); @@ -873,7 +854,6 @@ static void run_dialog (CcDateTimePanel *self, const gchar *dialog_name) { - CcDateTimePanelPrivate *priv = self->priv; GtkWidget *dialog, *parent; dialog = W (dialog_name); @@ -890,12 +870,11 @@ switch_to_row_transform_func (GBinding *binding, GValue *target_value, CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; gboolean active; gboolean allowed; active = g_value_get_boolean (source_value); - allowed = (priv->permission != NULL && g_permission_get_allowed (priv->permission)); + allowed = (self->permission != NULL && g_permission_get_allowed (self->permission)); g_value_set_boolean (target_value, !active && allowed); @@ -929,7 +908,6 @@ list_box_row_activated (GtkListBox *listbox, CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; gchar *widget_name, *found; widget_name = g_strdup (gtk_buildable_get_name (GTK_BUILDABLE (row))); @@ -962,8 +940,6 @@ static void setup_listbox (CcDateTimePanel *self, GtkWidget *listbox) { - CcDateTimePanelPrivate *priv = self->priv; - gtk_list_box_set_header_func (GTK_LIST_BOX (listbox), cc_list_box_update_header_func, NULL, NULL); g_signal_connect (listbox, "row-activated", G_CALLBACK (list_box_row_activated), self); @@ -971,8 +947,8 @@ setup_listbox (CcDateTimePanel *self, g_signal_connect (listbox, "keynav-failed", G_CALLBACK (keynav_failed), self); - priv->listboxes = g_list_append (priv->listboxes, listbox); - priv->listboxes_reverse = g_list_prepend (priv->listboxes_reverse, listbox); + self->listboxes = g_list_append (self->listboxes, listbox); + self->listboxes_reverse = g_list_prepend (self->listboxes_reverse, listbox); } static gboolean @@ -996,13 +972,12 @@ static gboolean format_hours_combobox (GtkSpinButton *spin, CcDateTimePanel *panel) { - CcDateTimePanelPrivate *priv = panel->priv; GtkAdjustment *adjustment; char *text; int hour; gboolean use_ampm; - if (priv->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) + if (panel->clock_format == G_DESKTOP_CLOCK_FORMAT_12H) use_ampm = TRUE; else use_ampm = FALSE; @@ -1022,17 +997,16 @@ format_hours_combobox (GtkSpinButton *spin, static void setup_timezone_dialog (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; GtkEntryCompletion *completion; GtkTreeModel *completion_model; GtkWidget *dialog; GtkWidget *entry; /* set up timezone map */ - priv->map = (GtkWidget *) cc_timezone_map_new (); - gtk_widget_show (priv->map); - gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->builder, "aspectmap")), - priv->map); + self->map = (GtkWidget *) cc_timezone_map_new (); + gtk_widget_show (self->map); + gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (self->builder, "aspectmap")), + self->map); dialog = W ("timezone-dialog"); entry = W ("timezone-searchentry"); @@ -1045,7 +1019,7 @@ setup_timezone_dialog (CcDateTimePanel *self) gtk_entry_set_completion (GTK_ENTRY (entry), completion); g_object_unref (completion); - completion_model = GTK_TREE_MODEL (gtk_builder_get_object (priv->builder, + completion_model = GTK_TREE_MODEL (gtk_builder_get_object (self->builder, "city-modelsort")); gtk_entry_completion_set_model (completion, completion_model); @@ -1083,25 +1057,24 @@ format_pm_label () static void setup_am_pm_button (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; GtkCssProvider *provider; GtkStyleContext *context; GtkWidget *am_pm_button; char *text; text = format_am_label (); - priv->am_label = gtk_label_new (text); + self->am_label = gtk_label_new (text); g_free (text); text = format_pm_label (); - priv->pm_label = gtk_label_new (text); + self->pm_label = gtk_label_new (text); g_free (text); - priv->am_pm_stack = W ("am_pm_stack"); - gtk_container_add (GTK_CONTAINER (priv->am_pm_stack), priv->am_label); - gtk_container_add (GTK_CONTAINER (priv->am_pm_stack), priv->pm_label); - gtk_widget_show_all (priv->am_pm_stack); - priv->am_pm_visiblity_changed_id = g_signal_connect_swapped (priv->am_pm_stack, + self->am_pm_stack = W ("am_pm_stack"); + gtk_container_add (GTK_CONTAINER (self->am_pm_stack), self->am_label); + gtk_container_add (GTK_CONTAINER (self->am_pm_stack), self->pm_label); + gtk_widget_show_all (self->am_pm_stack); + self->am_pm_visiblity_changed_id = g_signal_connect_swapped (self->am_pm_stack, "notify::visible-child", G_CALLBACK (am_pm_stack_visible_child_changed_cb), self); @@ -1126,7 +1099,6 @@ setup_am_pm_button (CcDateTimePanel *self) static void setup_datetime_dialog (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv = self->priv; GtkAdjustment *adjustment; GdkScreen *screen; GtkCssProvider *provider; @@ -1161,14 +1133,14 @@ setup_datetime_dialog (CcDateTimePanel *self) /* Month */ gtk_combo_box_set_active (GTK_COMBO_BOX (W ("month-combobox")), - g_date_time_get_month (priv->date) - 1); + g_date_time_get_month (self->date) - 1); g_signal_connect (G_OBJECT (W("month-combobox")), "changed", G_CALLBACK (month_year_changed), self); /* Day */ - num_days = g_date_get_days_in_month (g_date_time_get_month (priv->date), - g_date_time_get_year (priv->date)); - adjustment = (GtkAdjustment*) gtk_adjustment_new (g_date_time_get_day_of_month (priv->date), 1, + num_days = g_date_get_days_in_month (g_date_time_get_month (self->date), + g_date_time_get_year (self->date)); + adjustment = (GtkAdjustment*) gtk_adjustment_new (g_date_time_get_day_of_month (self->date), 1, num_days + 1, 1, 10, 1); gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (W ("day-spinbutton")), adjustment); @@ -1176,7 +1148,7 @@ setup_datetime_dialog (CcDateTimePanel *self) G_CALLBACK (day_changed), self); /* Year */ - adjustment = (GtkAdjustment*) gtk_adjustment_new (g_date_time_get_year (priv->date), + adjustment = (GtkAdjustment*) gtk_adjustment_new (g_date_time_get_year (self->date), 1, G_MAXDOUBLE, 1, 10, 1); gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON (W ("year-spinbutton")), @@ -1205,7 +1177,6 @@ setup_datetime_dialog (CcDateTimePanel *self) static void cc_date_time_panel_init (CcDateTimePanel *self) { - CcDateTimePanelPrivate *priv; GtkWidget *widget; GError *error; GtkTreeModelSort *city_modelsort; @@ -1213,25 +1184,24 @@ cc_date_time_panel_init (CcDateTimePanel *self) const char *date_grid_name; char *tmp; - priv = self->priv = DATE_TIME_PANEL_PRIVATE (self); g_resources_register (cc_datetime_get_resource ()); - priv->cancellable = g_cancellable_new (); + self->cancellable = g_cancellable_new (); error = NULL; - priv->dtm = timedate1_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + self->dtm = timedate1_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, "org.freedesktop.timedate1", "/org/freedesktop/timedate1", - priv->cancellable, + self->cancellable, &error); - if (priv->dtm == NULL) { + if (self->dtm == NULL) { g_warning ("could not get proxy for DateTimeMechanism: %s", error->message); g_clear_error (&error); return; } - priv->builder = gtk_builder_new (); - ret = gtk_builder_add_from_resource (priv->builder, + self->builder = gtk_builder_new (); + ret = gtk_builder_add_from_resource (self->builder, "/org/gnome/control-center/datetime/datetime.ui", &error); @@ -1261,18 +1231,18 @@ cc_date_time_panel_init (CcDateTimePanel *self) } tmp = g_strdup_printf ("/org/gnome/control-center/datetime/%s.ui", date_grid_name); - ret = gtk_builder_add_from_resource (priv->builder, tmp, NULL); + ret = gtk_builder_add_from_resource (self->builder, tmp, NULL); g_free (tmp); gtk_box_pack_end (GTK_BOX (W ("time-box")), W ("date_grid"), FALSE, TRUE, 0); /* add the lock button */ - priv->permission = polkit_permission_new_sync (DATETIME_PERMISSION, NULL, NULL, NULL); - if (priv->permission != NULL) + self->permission = polkit_permission_new_sync (DATETIME_PERMISSION, NULL, NULL, NULL); + if (self->permission != NULL) { - g_signal_connect (priv->permission, "notify", + g_signal_connect (self->permission, "notify", G_CALLBACK (on_permission_changed), self); - on_permission_changed (priv->permission, NULL, self); + on_permission_changed (self->permission, NULL, self); } else { @@ -1280,11 +1250,11 @@ cc_date_time_panel_init (CcDateTimePanel *self) DATETIME_PERMISSION); } - priv->date = g_date_time_new_now_local (); + self->date = g_date_time_new_now_local (); /* Top level windows from GtkBuilder that need to be destroyed explicitly */ - priv->toplevels = g_list_append (priv->toplevels, W ("datetime-dialog")); - priv->toplevels = g_list_append (priv->toplevels, W ("timezone-dialog")); + self->toplevels = g_list_append (self->toplevels, W ("datetime-dialog")); + self->toplevels = g_list_append (self->toplevels, W ("timezone-dialog")); setup_timezone_dialog (self); setup_datetime_dialog (self); @@ -1296,7 +1266,7 @@ cc_date_time_panel_init (CcDateTimePanel *self) bind_switch_to_row (self, W ("network_time_switch"), W ("datetime-button")); - g_object_bind_property (priv->dtm, "ntp", + g_object_bind_property (self->dtm, "ntp", W ("network_time_switch"), "active", G_BINDING_SYNC_CREATE); g_signal_connect (W("network_time_switch"), "notify::active", @@ -1309,23 +1279,23 @@ cc_date_time_panel_init (CcDateTimePanel *self) W ("auto_timezone_switch"), W ("timezone-button")); - priv->datetime_settings = g_settings_new (DATETIME_SCHEMA); - g_settings_bind (priv->datetime_settings, AUTO_TIMEZONE_KEY, + self->datetime_settings = g_settings_new (DATETIME_SCHEMA); + g_settings_bind (self->datetime_settings, AUTO_TIMEZONE_KEY, W ("auto_timezone_switch"), "active", G_SETTINGS_BIND_DEFAULT); /* Clock settings */ - priv->clock_settings = g_settings_new (CLOCK_SCHEMA); + self->clock_settings = g_settings_new (CLOCK_SCHEMA); widget = W ("vbox_datetime"); gtk_container_add (GTK_CONTAINER (self), widget); /* setup the time itself */ - priv->clock_tracker = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL); - g_signal_connect (priv->clock_tracker, "notify::clock", G_CALLBACK (on_clock_changed), self); + self->clock_tracker = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL); + g_signal_connect (self->clock_tracker, "notify::clock", G_CALLBACK (on_clock_changed), self); - clock_settings_changed_cb (priv->clock_settings, CLOCK_FORMAT_KEY, self); - g_signal_connect (priv->clock_settings, "changed::" CLOCK_FORMAT_KEY, + clock_settings_changed_cb (self->clock_settings, CLOCK_FORMAT_KEY, self); + g_signal_connect (self->clock_settings, "changed::" CLOCK_FORMAT_KEY, G_CALLBACK (clock_settings_changed_cb), self); g_signal_connect (W("format_combobox"), "notify::active-id", @@ -1333,10 +1303,10 @@ cc_date_time_panel_init (CcDateTimePanel *self) update_time (self); - load_regions_model (GTK_LIST_STORE (gtk_builder_get_object (priv->builder, + load_regions_model (GTK_LIST_STORE (gtk_builder_get_object (self->builder, "city-liststore"))); - city_modelsort = GTK_TREE_MODEL_SORT (gtk_builder_get_object (priv->builder, "city-modelsort")); + city_modelsort = GTK_TREE_MODEL_SORT (gtk_builder_get_object (self->builder, "city-modelsort")); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (city_modelsort), CITY_COL_CITY_HUMAN_READABLE, GTK_SORT_ASCENDING); @@ -1344,22 +1314,22 @@ cc_date_time_panel_init (CcDateTimePanel *self) * the model is filled up */ get_initial_timezone (self); - widget = (GtkWidget*) gtk_builder_get_object (self->priv->builder, + widget = (GtkWidget*) gtk_builder_get_object (self->builder, "timezone-searchentry"); g_signal_connect (gtk_entry_get_completion (GTK_ENTRY (widget)), "match-selected", G_CALLBACK (city_changed_cb), self); - g_signal_connect (self->priv->map, "location-changed", + g_signal_connect (self->map, "location-changed", G_CALLBACK (location_changed_cb), self); /* Watch changes of timedated remote service properties */ - g_signal_connect (priv->dtm, "g-properties-changed", + g_signal_connect (self->dtm, "g-properties-changed", G_CALLBACK (on_timedated_properties_changed), self); - g_signal_connect_swapped (priv->dtm, "notify::can-ntp", + g_signal_connect_swapped (self->dtm, "notify::can-ntp", G_CALLBACK (on_can_ntp_changed), self); - g_signal_connect_swapped (priv->dtm, "notify::timezone", + g_signal_connect_swapped (self->dtm, "notify::timezone", G_CALLBACK (on_timezone_changed), self); /* We ignore UTC <--> LocalRTC changes at the moment */ - priv->filechooser_settings = g_settings_new (FILECHOOSER_SCHEMA); + self->filechooser_settings = g_settings_new (FILECHOOSER_SCHEMA); } diff --git a/panels/datetime/cc-datetime-panel.h b/panels/datetime/cc-datetime-panel.h index e725d0f4f..29c0498b2 100644 --- a/panels/datetime/cc-datetime-panel.h +++ b/panels/datetime/cc-datetime-panel.h @@ -26,45 +26,8 @@ G_BEGIN_DECLS -#define CC_TYPE_DATE_TIME_PANEL cc_date_time_panel_get_type() - -#define CC_DATE_TIME_PANEL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - CC_TYPE_DATE_TIME_PANEL, CcDateTimePanel)) - -#define CC_DATE_TIME_PANEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - CC_TYPE_DATE_TIME_PANEL, CcDateTimePanelClass)) - -#define CC_IS_DATE_TIME_PANEL(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - CC_TYPE_DATE_TIME_PANEL)) - -#define CC_IS_DATE_TIME_PANEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - CC_TYPE_DATE_TIME_PANEL)) - -#define CC_DATE_TIME_PANEL_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - CC_TYPE_DATE_TIME_PANEL, CcDateTimePanelClass)) - -typedef struct _CcDateTimePanel CcDateTimePanel; -typedef struct _CcDateTimePanelClass CcDateTimePanelClass; -typedef struct _CcDateTimePanelPrivate CcDateTimePanelPrivate; - -struct _CcDateTimePanel -{ - CcPanel parent; - - CcDateTimePanelPrivate *priv; -}; - -struct _CcDateTimePanelClass -{ - CcPanelClass parent_class; -}; - -GType cc_date_time_panel_get_type (void) G_GNUC_CONST; +#define CC_TYPE_DATE_TIME_PANEL (cc_date_time_panel_get_type ()) +G_DECLARE_FINAL_TYPE (CcDateTimePanel, cc_date_time_panel, CC, DATE_TIME_PANEL, CcPanel) G_END_DECLS diff --git a/panels/datetime/cc-timezone-map.c b/panels/datetime/cc-timezone-map.c index 8b38c9e5b..ed416afb4 100644 --- a/panels/datetime/cc-timezone-map.c +++ b/panels/datetime/cc-timezone-map.c @@ -26,11 +26,6 @@ #include #include "tz.h" -G_DEFINE_TYPE (CcTimezoneMap, cc_timezone_map, GTK_TYPE_WIDGET) - -#define TIMEZONE_MAP_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_TIMEZONE_MAP, CcTimezoneMapPrivate)) - #define PIN_HOT_POINT_X 8 #define PIN_HOT_POINT_Y 15 @@ -45,8 +40,10 @@ typedef struct guchar alpha; } CcTimezoneMapOffset; -struct _CcTimezoneMapPrivate +struct _CcTimezoneMap { + GtkWidget parent_instance; + GdkPixbuf *orig_background; GdkPixbuf *orig_background_dim; GdkPixbuf *orig_color_map; @@ -66,6 +63,8 @@ struct _CcTimezoneMapPrivate gchar *bubble_text; }; +G_DEFINE_TYPE (CcTimezoneMap, cc_timezone_map, GTK_TYPE_WIDGET) + enum { LOCATION_CHANGED, @@ -122,21 +121,21 @@ static CcTimezoneMapOffset color_codes[] = static void cc_timezone_map_dispose (GObject *object) { - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (object)->priv; + CcTimezoneMap *self = CC_TIMEZONE_MAP (object); - g_clear_object (&priv->orig_background); - g_clear_object (&priv->orig_background_dim); - g_clear_object (&priv->orig_color_map); - g_clear_object (&priv->background); - g_clear_object (&priv->pin); - g_clear_pointer (&priv->bubble_text, g_free); + g_clear_object (&self->orig_background); + g_clear_object (&self->orig_background_dim); + g_clear_object (&self->orig_color_map); + g_clear_object (&self->background); + g_clear_object (&self->pin); + g_clear_pointer (&self->bubble_text, g_free); - if (priv->color_map) + if (self->color_map) { - g_clear_object (&priv->color_map); + g_clear_object (&self->color_map); - priv->visible_map_pixels = NULL; - priv->visible_map_rowstride = 0; + self->visible_map_pixels = NULL; + self->visible_map_rowstride = 0; } G_OBJECT_CLASS (cc_timezone_map_parent_class)->dispose (object); @@ -145,12 +144,12 @@ cc_timezone_map_dispose (GObject *object) static void cc_timezone_map_finalize (GObject *object) { - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (object)->priv; + CcTimezoneMap *self = CC_TIMEZONE_MAP (object); - if (priv->tzdb) + if (self->tzdb) { - tz_db_free (priv->tzdb); - priv->tzdb = NULL; + tz_db_free (self->tzdb); + self->tzdb = NULL; } @@ -163,10 +162,10 @@ cc_timezone_map_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural) { - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv; + CcTimezoneMap *map = CC_TIMEZONE_MAP (widget); gint size; - size = gdk_pixbuf_get_width (priv->orig_background); + size = gdk_pixbuf_get_width (map->orig_background); if (minimum != NULL) *minimum = size; @@ -179,10 +178,10 @@ cc_timezone_map_get_preferred_height (GtkWidget *widget, gint *minimum, gint *natural) { - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv; + CcTimezoneMap *map = CC_TIMEZONE_MAP (widget); gint size; - size = gdk_pixbuf_get_height (priv->orig_background); + size = gdk_pixbuf_get_height (map->orig_background); if (minimum != NULL) *minimum = size; @@ -194,32 +193,32 @@ static void cc_timezone_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv; + CcTimezoneMap *map = CC_TIMEZONE_MAP (widget); GdkPixbuf *pixbuf; - if (priv->background) - g_object_unref (priv->background); + if (map->background) + g_object_unref (map->background); if (!gtk_widget_is_sensitive (widget)) - pixbuf = priv->orig_background_dim; + pixbuf = map->orig_background_dim; else - pixbuf = priv->orig_background; + pixbuf = map->orig_background; - priv->background = gdk_pixbuf_scale_simple (pixbuf, - allocation->width, - allocation->height, - GDK_INTERP_BILINEAR); - - if (priv->color_map) - g_object_unref (priv->color_map); - - priv->color_map = gdk_pixbuf_scale_simple (priv->orig_color_map, + map->background = gdk_pixbuf_scale_simple (pixbuf, allocation->width, allocation->height, GDK_INTERP_BILINEAR); - priv->visible_map_pixels = gdk_pixbuf_get_pixels (priv->color_map); - priv->visible_map_rowstride = gdk_pixbuf_get_rowstride (priv->color_map); + if (map->color_map) + g_object_unref (map->color_map); + + map->color_map = gdk_pixbuf_scale_simple (map->orig_color_map, + allocation->width, + allocation->height, + GDK_INTERP_BILINEAR); + + map->visible_map_pixels = gdk_pixbuf_get_pixels (map->color_map); + map->visible_map_rowstride = gdk_pixbuf_get_rowstride (map->color_map); GTK_WIDGET_CLASS (cc_timezone_map_parent_class)->size_allocate (widget, allocation); @@ -301,7 +300,7 @@ draw_text_bubble (cairo_t *cr, static const double margin_left = 24.0; static const double margin_right = 24.0; - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv; + CcTimezoneMap *map = CC_TIMEZONE_MAP (widget); GtkAllocation alloc; PangoLayout *layout; PangoRectangle text_rect; @@ -310,7 +309,7 @@ draw_text_bubble (cairo_t *cr, double width; double height; - if (!priv->bubble_text) + if (!map->bubble_text) return; gtk_widget_get_allocation (widget, &alloc); @@ -319,7 +318,7 @@ draw_text_bubble (cairo_t *cr, /* Layout the text */ pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER); pango_layout_set_spacing (layout, 3); - pango_layout_set_markup (layout, priv->bubble_text, -1); + pango_layout_set_markup (layout, map->bubble_text, -1); pango_layout_get_pixel_extents (layout, NULL, &text_rect); @@ -365,7 +364,7 @@ static gboolean cc_timezone_map_draw (GtkWidget *widget, cairo_t *cr) { - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv; + CcTimezoneMap *map = CC_TIMEZONE_MAP (widget); GdkPixbuf *hilight, *orig_hilight; GtkAllocation alloc; gchar *file; @@ -376,7 +375,7 @@ cc_timezone_map_draw (GtkWidget *widget, gtk_widget_get_allocation (widget, &alloc); /* paint background */ - gdk_cairo_set_source_pixbuf (cr, priv->background, 0, 0); + gdk_cairo_set_source_pixbuf (cr, map->background, 0, 0); cairo_paint (cr); /* paint hilight */ @@ -384,13 +383,13 @@ cc_timezone_map_draw (GtkWidget *widget, { file = g_strdup_printf (DATETIME_RESOURCE_PATH "/timezone_%s.png", g_ascii_formatd (buf, sizeof (buf), - "%g", priv->selected_offset)); + "%g", map->selected_offset)); } else { file = g_strdup_printf (DATETIME_RESOURCE_PATH "/timezone_%s_dim.png", g_ascii_formatd (buf, sizeof (buf), - "%g", priv->selected_offset)); + "%g", map->selected_offset)); } @@ -417,19 +416,19 @@ cc_timezone_map_draw (GtkWidget *widget, g_object_unref (orig_hilight); } - if (priv->location) + if (map->location) { - pointx = convert_longitude_to_x (priv->location->longitude, alloc.width); - pointy = convert_latitude_to_y (priv->location->latitude, alloc.height); + pointx = convert_longitude_to_x (map->location->longitude, alloc.width); + pointy = convert_latitude_to_y (map->location->latitude, alloc.height); pointx = CLAMP (floor (pointx), 0, alloc.width); pointy = CLAMP (floor (pointy), 0, alloc.height); draw_text_bubble (cr, widget, pointx, pointy); - if (priv->pin) + if (map->pin) { - gdk_cairo_set_source_pixbuf (cr, priv->pin, + gdk_cairo_set_source_pixbuf (cr, map->pin, pointx - PIN_HOT_POINT_X, pointy - PIN_HOT_POINT_Y); cairo_paint (cr); @@ -479,8 +478,6 @@ cc_timezone_map_class_init (CcTimezoneMapClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - g_type_class_add_private (klass, sizeof (CcTimezoneMapPrivate)); - object_class->dispose = cc_timezone_map_dispose; object_class->finalize = cc_timezone_map_finalize; @@ -520,17 +517,16 @@ static void set_location (CcTimezoneMap *map, TzLocation *location) { - CcTimezoneMapPrivate *priv = map->priv; TzInfo *info; - priv->location = location; + map->location = location; - info = tz_info_from_location (priv->location); + info = tz_info_from_location (map->location); - priv->selected_offset = tz_location_get_utc_offset (priv->location) + map->selected_offset = tz_location_get_utc_offset (map->location) / (60.0*60.0) + ((info->daylight) ? -1.0 : 0.0); - g_signal_emit (map, signals[LOCATION_CHANGED], 0, priv->location); + g_signal_emit (map, signals[LOCATION_CHANGED], 0, map->location); tz_info_free (info); } @@ -539,7 +535,7 @@ static gboolean button_press_event (GtkWidget *widget, GdkEventButton *event) { - CcTimezoneMapPrivate *priv = CC_TIMEZONE_MAP (widget)->priv; + CcTimezoneMap *map = CC_TIMEZONE_MAP (widget); gint x, y; guchar r, g, b, a; guchar *pixels; @@ -555,8 +551,8 @@ button_press_event (GtkWidget *widget, y = event->y; - rowstride = priv->visible_map_rowstride; - pixels = priv->visible_map_pixels; + rowstride = map->visible_map_rowstride; + pixels = map->visible_map_pixels; r = pixels[(rowstride * y + x * 4)]; g = pixels[(rowstride * y + x * 4) + 1]; @@ -569,7 +565,7 @@ button_press_event (GtkWidget *widget, if (color_codes[i].red == r && color_codes[i].green == g && color_codes[i].blue == b && color_codes[i].alpha == a) { - priv->selected_offset = color_codes[i].offset; + map->selected_offset = color_codes[i].offset; } } @@ -577,7 +573,7 @@ button_press_event (GtkWidget *widget, /* work out the co-ordinates */ - array = tz_get_locations (priv->tzdb); + array = tz_get_locations (map->tzdb); gtk_widget_get_allocation (widget, &alloc); width = alloc.width; @@ -609,54 +605,51 @@ button_press_event (GtkWidget *widget, } static void -cc_timezone_map_init (CcTimezoneMap *self) +cc_timezone_map_init (CcTimezoneMap *map) { - CcTimezoneMapPrivate *priv; GError *err = NULL; - priv = self->priv = TIMEZONE_MAP_PRIVATE (self); - - priv->orig_background = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/bg.png", - &err); - - if (!priv->orig_background) - { - g_warning ("Could not load background image: %s", - (err) ? err->message : "Unknown error"); - g_clear_error (&err); - } - - priv->orig_background_dim = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/bg_dim.png", - &err); - - if (!priv->orig_background_dim) - { - g_warning ("Could not load background image: %s", - (err) ? err->message : "Unknown error"); - g_clear_error (&err); - } - - priv->orig_color_map = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/cc.png", + map->orig_background = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/bg.png", &err); - if (!priv->orig_color_map) + + if (!map->orig_background) { g_warning ("Could not load background image: %s", (err) ? err->message : "Unknown error"); g_clear_error (&err); } - priv->pin = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/pin.png", - &err); - if (!priv->pin) + map->orig_background_dim = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/bg_dim.png", + &err); + + if (!map->orig_background_dim) + { + g_warning ("Could not load background image: %s", + (err) ? err->message : "Unknown error"); + g_clear_error (&err); + } + + map->orig_color_map = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/cc.png", + &err); + if (!map->orig_color_map) + { + g_warning ("Could not load background image: %s", + (err) ? err->message : "Unknown error"); + g_clear_error (&err); + } + + map->pin = gdk_pixbuf_new_from_resource (DATETIME_RESOURCE_PATH "/pin.png", + &err); + if (!map->pin) { g_warning ("Could not load pin icon: %s", (err) ? err->message : "Unknown error"); g_clear_error (&err); } - priv->tzdb = tz_load_db (); + map->tzdb = tz_load_db (); - g_signal_connect (self, "button-press-event", G_CALLBACK (button_press_event), + g_signal_connect (map, "button-press-event", G_CALLBACK (button_press_event), NULL); } @@ -675,9 +668,9 @@ cc_timezone_map_set_timezone (CcTimezoneMap *map, char *real_tz; gboolean ret; - real_tz = tz_info_get_clean_name (map->priv->tzdb, timezone); + real_tz = tz_info_get_clean_name (map->tzdb, timezone); - locations = tz_get_locations (map->priv->tzdb); + locations = tz_get_locations (map->tzdb); ret = FALSE; for (i = 0; i < locations->len; i++) @@ -704,10 +697,8 @@ void cc_timezone_map_set_bubble_text (CcTimezoneMap *map, const gchar *text) { - CcTimezoneMapPrivate *priv = TIMEZONE_MAP_PRIVATE (map); - - g_free (priv->bubble_text); - priv->bubble_text = g_strdup (text); + g_free (map->bubble_text); + map->bubble_text = g_strdup (text); gtk_widget_queue_draw (GTK_WIDGET (map)); } @@ -715,5 +706,5 @@ cc_timezone_map_set_bubble_text (CcTimezoneMap *map, TzLocation * cc_timezone_map_get_location (CcTimezoneMap *map) { - return map->priv->location; + return map->location; } diff --git a/panels/datetime/cc-timezone-map.h b/panels/datetime/cc-timezone-map.h index facf133e4..bf6cbc2f0 100644 --- a/panels/datetime/cc-timezone-map.h +++ b/panels/datetime/cc-timezone-map.h @@ -27,45 +27,8 @@ G_BEGIN_DECLS -#define CC_TYPE_TIMEZONE_MAP cc_timezone_map_get_type() - -#define CC_TIMEZONE_MAP(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - CC_TYPE_TIMEZONE_MAP, CcTimezoneMap)) - -#define CC_TIMEZONE_MAP_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - CC_TYPE_TIMEZONE_MAP, CcTimezoneMapClass)) - -#define CC_IS_TIMEZONE_MAP(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - CC_TYPE_TIMEZONE_MAP)) - -#define CC_IS_TIMEZONE_MAP_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - CC_TYPE_TIMEZONE_MAP)) - -#define CC_TIMEZONE_MAP_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - CC_TYPE_TIMEZONE_MAP, CcTimezoneMapClass)) - -typedef struct _CcTimezoneMap CcTimezoneMap; -typedef struct _CcTimezoneMapClass CcTimezoneMapClass; -typedef struct _CcTimezoneMapPrivate CcTimezoneMapPrivate; - -struct _CcTimezoneMap -{ - GtkWidget parent; - - CcTimezoneMapPrivate *priv; -}; - -struct _CcTimezoneMapClass -{ - GtkWidgetClass parent_class; -}; - -GType cc_timezone_map_get_type (void) G_GNUC_CONST; +#define CC_TYPE_TIMEZONE_MAP (cc_timezone_map_get_type ()) +G_DECLARE_FINAL_TYPE (CcTimezoneMap, cc_timezone_map, CC, TIMEZONE_MAP, GtkWidget) CcTimezoneMap *cc_timezone_map_new (void);