From 486ad3625ca52b318f5514f782b90f1eda0b87e7 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 24 Feb 2011 15:02:00 -0500 Subject: have spinners work in unison -- only save when neither is focused --- src/datetime-prefs.c | 124 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 92 insertions(+), 32 deletions(-) diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index fbadd27..d053c7e 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -46,6 +46,11 @@ GDBusProxy * proxy = NULL; GtkWidget * auto_radio = NULL; GtkWidget * tz_entry = NULL; CcTimezoneMap * tzmap = NULL; +GtkWidget * time_spin = NULL; +GtkWidget * date_spin = NULL; +GDateTime * manual_time = NULL; +guint save_time_id = 0; +gboolean user_edited_time = FALSE; /* Turns the boolean property into a string gsettings */ static GVariant * @@ -277,13 +282,56 @@ void proxy_ready (GObject *object, GAsyncResult *res, gpointer user_data) NULL, tz_query_answered, NULL); } +static gboolean +are_spinners_focused (void) +{ + // save_time_id means that we were in focus and haven't finished our save + // yet, so act like we are still focused. + return save_time_id || gtk_widget_has_focus (time_spin) || gtk_widget_has_focus (date_spin); +} + +static gboolean +save_time (gpointer user_data) +{ + if (user_edited_time) { + g_dbus_proxy_call (proxy, "SetTime", g_variant_new ("(x)", g_date_time_to_unix (manual_time)), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "time"); + } + user_edited_time = FALSE; + save_time_id = 0; + return FALSE; +} + +static gboolean +spin_focus_in (void) +{ + if (save_time_id > 0) { + g_source_remove (save_time_id); + save_time_id = 0; + } + return FALSE; +} + +static gboolean +spin_focus_out (void) +{ + /* We want to only save when both spinners are unfocused. But it's difficult + to tell who is about to get focus during a focus-out. So we set an idle + callback to save the time if we don't focus in to another spinner by that + time. */ + if (save_time_id == 0) { + save_time_id = g_idle_add ((GSourceFunc)save_time, NULL); + } + return FALSE; +} + static int input_time_text (GtkWidget * spinner, gdouble *value, gpointer user_data) { gboolean is_time = (gboolean)GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinner), "is-time")); const gchar * text = gtk_entry_get_text (GTK_ENTRY (spinner)); - GDateTime * now = g_date_time_new_now_local (); + GDateTime * now = manual_time; gint year, month, day, hour, minute, second; year = g_date_time_get_year (now); month = g_date_time_get_month (now); @@ -291,7 +339,6 @@ input_time_text (GtkWidget * spinner, gdouble *value, gpointer user_data) hour = g_date_time_get_hour (now); minute = g_date_time_get_minute (now); second = g_date_time_get_second (now); - g_date_time_unref (now); /* Parse this string as if it were in the output format */ gint scanned = 0; @@ -354,10 +401,9 @@ input_time_text (GtkWidget * spinner, gdouble *value, gpointer user_data) return TRUE; } - GDateTime * datetime = g_date_time_new_local (year, month, day, hour, minute, second); - - g_dbus_proxy_call (proxy, "SetTime", g_variant_new ("(x)", g_date_time_to_unix (datetime)), - G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "time"); + g_date_time_unref (manual_time); + manual_time = g_date_time_new_local (year, month, day, hour, minute, second); + user_edited_time = TRUE; return TRUE; } @@ -365,12 +411,6 @@ input_time_text (GtkWidget * spinner, gdouble *value, gpointer user_data) static gboolean format_time_text (GtkWidget * spinner, gpointer user_data) { - if (gtk_widget_has_focus (spinner)) { - /* Don't do anything if we have focus, user is likely editing us */ - return TRUE; - } - - GDateTime * datetime = (GDateTime *)g_object_get_data (G_OBJECT (spinner), "datetime"); gboolean is_time = (gboolean)GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinner), "is-time")); const gchar * format; @@ -385,39 +425,60 @@ format_time_text (GtkWidget * spinner, gpointer user_data) format = "%Y-%m-%d"; } - gchar * formatted = g_date_time_format (datetime, format); + gchar * formatted = g_date_time_format (manual_time, format); gtk_entry_set_text (GTK_ENTRY (spinner), formatted); return TRUE; } static gboolean -update_spinner (GtkWidget * spinner) +update_spinners (void) { /* Add datetime object to spinner, which will hold the real time value, rather - then using the value of the spinner itself. */ - GDateTime * datetime = g_date_time_new_now_local (); - g_object_set_data_full (G_OBJECT (spinner), "datetime", datetime, (GDestroyNotify)g_date_time_unref); - - format_time_text (spinner, NULL); - + then using the value of the spinner itself. And don't update while user is + editing. */ + if (!are_spinners_focused ()) { + if (manual_time != NULL) { + g_date_time_unref (manual_time); + } + manual_time = g_date_time_new_now_local (); + format_time_text (time_spin, NULL); + format_time_text (date_spin, NULL); + } return TRUE; } static void -setup_time_spinner (GtkWidget * spinner, GtkWidget * other, gboolean is_time) +setup_time_spinners (GtkWidget * time, GtkWidget * date) { - /* Set up spinner to have reasonable behavior */ - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), FALSE); - g_signal_connect (spinner, "input", G_CALLBACK (input_time_text), other); - g_signal_connect (spinner, "output", G_CALLBACK (format_time_text), other); - g_object_set_data (G_OBJECT (spinner), "is-time", GINT_TO_POINTER (is_time)); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (time), FALSE); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (date), FALSE); - /* 2 seconds is what the indicator itself uses */ - guint time_id = g_timeout_add_seconds (2, (GSourceFunc)update_spinner, spinner); - g_signal_connect_swapped (spinner, "destroy", G_CALLBACK (g_source_remove), GINT_TO_POINTER (time_id)); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (time), TRUE); + gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (date), TRUE); + + g_signal_connect (time, "input", G_CALLBACK (input_time_text), date); + g_signal_connect (date, "input", G_CALLBACK (input_time_text), time); + + g_signal_connect (time, "output", G_CALLBACK (format_time_text), date); + g_signal_connect (date, "output", G_CALLBACK (format_time_text), time); + + g_signal_connect (time, "focus-in-event", G_CALLBACK (spin_focus_in), date); + g_signal_connect (date, "focus-in-event", G_CALLBACK (spin_focus_in), time); - update_spinner (spinner); + g_signal_connect (time, "focus-out-event", G_CALLBACK (spin_focus_out), date); + g_signal_connect (date, "focus-out-event", G_CALLBACK (spin_focus_out), time); + + g_object_set_data (G_OBJECT (time), "is-time", GINT_TO_POINTER (TRUE)); + g_object_set_data (G_OBJECT (date), "is-time", GINT_TO_POINTER (FALSE)); + + time_spin = time; + date_spin = date; + + /* 2 seconds is what the indicator itself uses */ + guint time_id = g_timeout_add_seconds (2, (GSourceFunc)update_spinners, NULL); + g_signal_connect_swapped (time_spin, "destroy", G_CALLBACK (g_source_remove), GINT_TO_POINTER (time_id)); + update_spinners (); } static void @@ -554,8 +615,7 @@ create_dialog (void) gtk_widget_set_sensitive (WIG ("showEventsCheck"), (evo_path != NULL)); g_free (evo_path); - setup_time_spinner (WIG ("timeSpinner"), WIG ("dateSpinner"), TRUE); - setup_time_spinner (WIG ("dateSpinner"), WIG ("timeSpinner"), FALSE); + setup_time_spinners (WIG ("timeSpinner"), WIG ("dateSpinner")); GtkWidget * dlg = WIG ("timeDateDialog"); auto_radio = WIG ("automaticTimeRadio"); -- cgit v1.2.3 From 2de6f443b603965a7fc786df9ef58fcc63841daf Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 28 Feb 2011 23:05:10 -0500 Subject: Simplify calendar query, we don't need to compute times for the range. The query system has a built in way to specify a relative range. --- src/datetime-service.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 6303a98..078ede0 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -462,8 +462,7 @@ update_appointment_menu_items (gpointer user_data) { if (calendar == NULL) return FALSE; if (!g_settings_get_boolean(conf, SETTINGS_SHOW_EVENTS_S)) return FALSE; - time_t t1, t2; - gchar *query, *is, *ie, *ad; + gchar *query, *ad; GList *objects = NULL, *l; GList *allobjects = NULL; GSList *g; @@ -472,13 +471,6 @@ update_appointment_menu_items (gpointer user_data) { gint width, height; ESourceList * sources = NULL; - time(&t1); - time(&t2); - t2 += (time_t) (7 * 24 * 60 * 60); /* 7 days ahead of now */ - - is = isodate_from_time_t(t1); - ie = isodate_from_time_t(t2); - gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); /* Remove all of the previous appointments */ @@ -497,7 +489,7 @@ update_appointment_menu_items (gpointer user_data) { // TODO Remove all highlights from the calendar widget // FIXME can we put a limit on the number of results? Or if not complete, or is event/todo? Or sort it by date? - query = g_strdup_printf("(occur-in-time-range? (make-time\"%s\") (make-time\"%s\"))", is, ie); + query = g_strdup_printf("(occur-in-time-range? (time-now) (time-add-day (time-now) 7))"); if (!e_cal_get_sources(&sources, E_CAL_SOURCE_TYPE_EVENT, &gerror)) { g_debug("Failed to get ecal sources\n"); -- cgit v1.2.3 From 6ee562ac5028df8f28e3559656117d7093b0f73c Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 1 Mar 2011 16:31:28 -0500 Subject: let date spin buttons work --- data/datetime-dialog.ui | 14 ++++++++++++ src/datetime-prefs.c | 57 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui index 35cb172..4277d72 100644 --- a/data/datetime-dialog.ui +++ b/data/datetime-dialog.ui @@ -2,6 +2,11 @@ + + 1.8446744073709552e+19 + 86400 + 864000 + False Locations @@ -102,6 +107,11 @@ + + 1.8446744073709552e+19 + 60 + 3600 + False 5 @@ -286,6 +296,8 @@ 11 1 True + timeAdjustment + True False @@ -328,6 +340,8 @@ 11 1 True + dateAdjustment + True False diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index c71217a..b6fd1c9 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -48,9 +48,9 @@ GtkWidget * tz_entry = NULL; CcTimezoneMap * tzmap = NULL; GtkWidget * time_spin = NULL; GtkWidget * date_spin = NULL; -GDateTime * manual_time = NULL; guint save_time_id = 0; gboolean user_edited_time = FALSE; +gboolean changing_time = FALSE; /* Turns the boolean property into a string gsettings */ static GVariant * @@ -255,7 +255,8 @@ static gboolean save_time (gpointer user_data) { if (user_edited_time) { - g_dbus_proxy_call (proxy, "SetTime", g_variant_new ("(x)", g_date_time_to_unix (manual_time)), + gdouble current_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (date_spin)); + g_dbus_proxy_call (proxy, "SetTime", g_variant_new ("(x)", (guint64)current_value), G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "time"); } user_edited_time = FALSE; @@ -287,12 +288,15 @@ spin_focus_out (void) } static int -input_time_text (GtkWidget * spinner, gdouble *value, gpointer user_data) +input_time_text (GtkWidget * spinner, gdouble * value, gpointer user_data) { gboolean is_time = (gboolean)GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinner), "is-time")); const gchar * text = gtk_entry_get_text (GTK_ENTRY (spinner)); - GDateTime * now = manual_time; + gdouble current_value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinner)); + *value = current_value; + + GDateTime * now = g_date_time_new_from_unix_utc (current_value); gint year, month, day, hour, minute, second; year = g_date_time_get_year (now); month = g_date_time_get_month (now); @@ -362,9 +366,13 @@ input_time_text (GtkWidget * spinner, gdouble *value, gpointer user_data) return TRUE; } - g_date_time_unref (manual_time); - manual_time = g_date_time_new_local (year, month, day, hour, minute, second); + gboolean prev_changing = changing_time; + changing_time = TRUE; + GDateTime * new_time = g_date_time_new_local (year, month, day, hour, minute, second); + *value = g_date_time_to_unix (new_time); user_edited_time = TRUE; + g_date_time_unref (new_time); + changing_time = prev_changing; return TRUE; } @@ -386,12 +394,25 @@ format_time_text (GtkWidget * spinner, gpointer user_data) format = "%Y-%m-%d"; } - gchar * formatted = g_date_time_format (manual_time, format); + GDateTime * datetime = g_date_time_new_from_unix_utc (gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinner))); + gchar * formatted = g_date_time_format (datetime, format); gtk_entry_set_text (GTK_ENTRY (spinner), formatted); + g_date_time_unref (datetime); return TRUE; } +static void +spin_copy_value (GtkSpinButton * spinner, GtkSpinButton * other) +{ + if (gtk_spin_button_get_value (spinner) != gtk_spin_button_get_value (other)) { + gtk_spin_button_set_value (other, gtk_spin_button_get_value (spinner)); + } + if (!changing_time) { /* Means user pressed spin buttons */ + user_edited_time = TRUE; + } +} + static gboolean update_spinners (void) { @@ -399,12 +420,13 @@ update_spinners (void) then using the value of the spinner itself. And don't update while user is editing. */ if (!are_spinners_focused ()) { - if (manual_time != NULL) { - g_date_time_unref (manual_time); - } - manual_time = g_date_time_new_now_local (); - format_time_text (time_spin, NULL); - format_time_text (date_spin, NULL); + gboolean prev_changing = changing_time; + changing_time = TRUE; + GDateTime * now = g_date_time_new_now_local (); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (time_spin), (gdouble)g_date_time_to_unix (now)); + /* will be copied to other spin button */ + g_date_time_unref (now); + changing_time = prev_changing; } return TRUE; } @@ -412,12 +434,6 @@ update_spinners (void) static void setup_time_spinners (GtkWidget * time, GtkWidget * date) { - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (time), FALSE); - gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (date), FALSE); - - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (time), TRUE); - gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (date), TRUE); - g_signal_connect (time, "input", G_CALLBACK (input_time_text), date); g_signal_connect (date, "input", G_CALLBACK (input_time_text), time); @@ -430,6 +446,9 @@ setup_time_spinners (GtkWidget * time, GtkWidget * date) g_signal_connect (time, "focus-out-event", G_CALLBACK (spin_focus_out), date); g_signal_connect (date, "focus-out-event", G_CALLBACK (spin_focus_out), time); + g_signal_connect (time, "value-changed", G_CALLBACK (spin_copy_value), date); + g_signal_connect (date, "value-changed", G_CALLBACK (spin_copy_value), time); + g_object_set_data (G_OBJECT (time), "is-time", GINT_TO_POINTER (TRUE)); g_object_set_data (G_OBJECT (date), "is-time", GINT_TO_POINTER (FALSE)); -- cgit v1.2.3 From 8dbd819cd5143cb6016b775d0e229819cf324604 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 3 Mar 2011 09:34:57 -0500 Subject: fix some visual issues mpt found; drop libmap/Makefile.in from bzr --- data/datetime-dialog.ui | 849 ++++++++++++++++++++++++------------------------ libmap/Makefile.in | 733 ----------------------------------------- src/datetime-prefs.c | 35 +- 3 files changed, 465 insertions(+), 1152 deletions(-) delete mode 100644 libmap/Makefile.in diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui index 35cb172..050c374 100644 --- a/data/datetime-dialog.ui +++ b/data/datetime-dialog.ui @@ -102,63 +102,36 @@ - + False 5 Time & Date False time-admin dialog - - + + True - False - - - False - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - - False - True - end - 0 - - + True - + True - True + False + 12 + 6 - + True False - 12 - 6 + 12 - + True False 6 - 300 + 265 True False 0 @@ -174,10 +147,38 @@ - + True - True - • + False + 6 + + + True + False + 1 + _Location: + True + timezoneEntry + + + False + True + 0 + + + + + True + True + • + True + + + True + True + 1 + + False @@ -185,30 +186,99 @@ 1 + + + True + True + 0 + + + + + True + False + 2 + 2 + 6 + 6 - + True False - 2 - 2 - 6 - 6 + 6 - + + _Manually + True + True + False + False + True + 0 + True + True + + + False + True + 0 + + + + + _Automatically from the Internet + True + False + True + False + False + True + 0 + True + manualTimeRadio + + + False + True + 1 + + + + + 1 + 2 + + + + + True + False + 1 + Set the time: + + + GTK_FILL + GTK_FILL + + + + + True + False + 12 + + True False 6 - - _Manually + True True - False - False - True - 0 - True - True + • + 11 + 1 + True False @@ -216,83 +286,26 @@ 0 - - - _Automatically from the Internet - True - False - True - False - False - True - 0 - True - manualTimeRadio - - - False - True - 1 - - - - - 1 - 2 - - - - - True - False - 0 - Set the time: - GTK_FILL - GTK_FILL + False + True + 0 - + True False - 12 + 6 - + True False - 6 - - - True - False - 0 - Tim_e: - True - timeSpinner - - - False - True - 0 - - - - - True - True - • - 11 - 1 - True - - - False - True - 1 - - + 0 + _Date: + True + dateSpinner False @@ -301,40 +314,13 @@ - + True - False - 6 - - - True - False - 0 - _Date: - True - dateSpinner - - - False - True - 0 - - - - - True - True - • - 11 - 1 - True - - - False - True - 1 - - + True + • + 11 + 1 + True False @@ -344,133 +330,157 @@ - 1 - 2 - 1 - 2 + False + True + 1 - - - - False - True - 2 + 1 + 2 + 1 + 2 + + + + + True + False + 1 + Tim_e: + True + timeSpinner + + + 1 + 2 + GTK_FILL + GTK_FILL - True + False True - end - 0 + 1 - - - - - - - - True - False - 1 - _Time & Date - True - False + True + True + end + 0 - + + + + + + + True + False + 1 + _Time & Date + True + + + False + + + + + True + False + 0 + 0 + + True False - 0 - 0 + 12 + 12 + + + _Show a clock in the menu bar + True + True + False + False + True + 0 + True + + + True + True + 0 + + - + True False - 12 - 12 + True - - _Show a clock in the panel - True - True - False - False - True - 0 - True - - - True - True - 0 - - - - + True False - True + 6 - + + True + False + 0 + In the clock, show: + + + False + True + 0 + + + + + _Weekday + True + True + False + False + True + 0 + True + + + False + True + 1 + + + + + _Date and time + True + True + False + False + True + 0 + True + + + False + True + 2 + + + + True False - 6 - - - True - False - 0 - In the clock, show: - - - False - True - 0 - - - - - _Weekday - True - True - False - False - True - 0 - True - - - False - True - 1 - - - - - _Date and time - True - True - False - False - True - 0 - True - - - False - True - 2 - - _12-hour time @@ -486,7 +496,7 @@ False True - 3 + 0 @@ -504,27 +514,52 @@ False True - 4 - - - - - Seco_nds - True - True - False - False - True - 0 - True - - - False - True - 5 + 1 + + False + True + 3 + + + + + Seco_nds + True + True + False + False + True + 0 + True + + + False + True + 4 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + 0 + In the clock’s menu, show: + True True @@ -532,156 +567,130 @@ - + + _Monthly calendar + True + True + False + False + True + 0 + True + + + False + True + 1 + + + + True False - 6 - - - True - False - 0 - In the clock’s menu, show: - - - True - True - 0 - - - - - _Monthly calendar - True - True - False - False - True - 0 - True - - - False - True - 1 - - + 0 + 0 + 0 + 24 - + True False - 0 - 0 - 0 - 0 - 12 + 6 - + + Include week num_bers True - False - 6 - - - Include week num_bers - True - True - False - False - True - 0 - True - - - True - True - 0 - - + True + False + False + True + 0 + True + + True + True + 0 + - - False - True - 2 - + + + False + True + 2 + + + + + True + True + False + False + True + 0 + True - + True - True - False - False - True + False 0 - True - - - True - False - 0 - Coming _events from Evolution Calendar - True - True - showEventsCheck - - + Coming _events from Evolution Calendar + True + True + showEventsCheck - - False - True - 3 - + + + False + True + 3 + + + + + Time in _other locations + True + True + False + False + True + 0 + True + + + False + True + 5 + + + + + True + False + 0 + 0 + 0 + 0 + 24 - - Time in _other locations + + Choose _Locations… True True - False + True False True 0 - True - - - False - True - 4 - - - - - True - False - 0 - 0 - 0 - 0 - 12 - - - Choose _Locations… - True - True - True - False - True - 0 - - - - True - True - 5 - True True - 1 + 5 @@ -692,36 +701,40 @@ + + True + True + 1 + - - 1 - False - - - - - True - False - _Clock - True - - - 1 - False - - True - True 1 + False + + + + + True + False + _Clock + True + + + 1 + False - - closeButton - + + + + + + + diff --git a/libmap/Makefile.in b/libmap/Makefile.in deleted file mode 100644 index dd552a4..0000000 --- a/libmap/Makefile.in +++ /dev/null @@ -1,733 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -noinst_PROGRAMS = test-timezone$(EXEEXT) -subdir = libmap -DIST_COMMON = README $(dist_tzdata_DATA) $(dist_ui_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libmap_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libmap_la_OBJECTS = cc-timezone-map.lo tz.lo -libmap_la_OBJECTS = $(am_libmap_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) -am__v_lt_0 = --silent -libmap_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libmap_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(noinst_PROGRAMS) -am_test_timezone_OBJECTS = test_timezone-test-timezone.$(OBJEXT) \ - test_timezone-tz.$(OBJEXT) -test_timezone_OBJECTS = $(am_test_timezone_OBJECTS) -test_timezone_DEPENDENCIES = $(am__DEPENDENCIES_1) -test_timezone_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_timezone_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) -am__v_at_0 = @ -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libmap_la_SOURCES) $(test_timezone_SOURCES) -DIST_SOURCES = $(libmap_la_SOURCES) $(test_timezone_SOURCES) -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(tzdatadir)" "$(DESTDIR)$(uidir)" -DATA = $(dist_tzdata_DATA) $(dist_ui_DATA) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DBUSSERVICEDIR = @DBUSSERVICEDIR@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOMELOCALEDIR = @GNOMELOCALEDIR@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INDICATORDIR = @INDICATORDIR@ -INDICATORICONSDIR = @INDICATORICONSDIR@ -INDICATOR_CFLAGS = @INDICATOR_CFLAGS@ -INDICATOR_LIBS = @INDICATOR_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBMAP_CFLAGS = @LIBMAP_CFLAGS@ -LIBMAP_LDFLAGS = @LIBMAP_LDFLAGS@ -LIBMAP_LIBS = @LIBMAP_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -PREF_CFLAGS = @PREF_CFLAGS@ -PREF_LIBS = @PREF_LIBS@ -RANLIB = @RANLIB@ -SED = @SED@ -SERVICE_CFLAGS = @SERVICE_CFLAGS@ -SERVICE_LIBS = @SERVICE_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -uidir = $(pkgdatadir)/libmap/ui -dist_ui_DATA = \ - data/bg.png \ - data/cc.png \ - data/olsen_map.png \ - data/pin.png \ - data/timezone_0.png \ - data/timezone_-10.png \ - data/timezone_10.png \ - data/timezone_10.5.png \ - data/timezone_-1.png \ - data/timezone_1.png \ - data/timezone_-11.png \ - data/timezone_11.png \ - data/timezone_11.5.png \ - data/timezone_12.png \ - data/timezone_12.75.png \ - data/timezone_13.png \ - data/timezone_-2.png \ - data/timezone_2.png \ - data/timezone_-3.png \ - data/timezone_3.png \ - data/timezone_-3.5.png \ - data/timezone_3.5.png \ - data/timezone_-4.png \ - data/timezone_4.png \ - data/timezone_-4.5.png \ - data/timezone_4.5.png \ - data/timezone_-5.png \ - data/timezone_5.png \ - data/timezone_-5.5.png \ - data/timezone_5.5.png \ - data/timezone_5.75.png \ - data/timezone_-6.png \ - data/timezone_6.png \ - data/timezone_6.5.png \ - data/timezone_-7.png \ - data/timezone_7.png \ - data/timezone_-8.png \ - data/timezone_8.png \ - data/timezone_-9.png \ - data/timezone_9.png \ - data/timezone_-9.5.png \ - data/timezone_9.5.png - -tzdatadir = $(pkgdatadir)/libmap/datetime -dist_tzdata_DATA = backward -AM_CPPFLAGS = \ - $(LIBMAP_CFLAGS) \ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ - -DGNOMECC_DATA_DIR="\"$(pkgdatadir)/libmap\"" \ - -DDATADIR="\"$(uidir)\"" \ - $(NULL) - -test_timezone_SOURCES = test-timezone.c tz.c tz.h -test_timezone_LDADD = $(LIBMAP_LIBS) -test_timezone_CFLAGS = $(LIBMAP_CFLAGS) -noinst_LTLIBRARIES = libmap.la -libmap_la_SOURCES = \ - cc-timezone-map.c \ - cc-timezone-map.h \ - tz.c tz.h - -libmap_la_LIBADD = $(LIBMAP_LIBS) -libmap_la_LDFLAGS = $(LIBMAP_LDFLAGS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libmap/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu libmap/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libmap.la: $(libmap_la_OBJECTS) $(libmap_la_DEPENDENCIES) - $(AM_V_CCLD)$(libmap_la_LINK) $(libmap_la_OBJECTS) $(libmap_la_LIBADD) $(LIBS) - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -test-timezone$(EXEEXT): $(test_timezone_OBJECTS) $(test_timezone_DEPENDENCIES) - @rm -f test-timezone$(EXEEXT) - $(AM_V_CCLD)$(test_timezone_LINK) $(test_timezone_OBJECTS) $(test_timezone_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cc-timezone-map.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_timezone-test-timezone.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_timezone-tz.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tz.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -test_timezone-test-timezone.o: test-timezone.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -MT test_timezone-test-timezone.o -MD -MP -MF $(DEPDIR)/test_timezone-test-timezone.Tpo -c -o test_timezone-test-timezone.o `test -f 'test-timezone.c' || echo '$(srcdir)/'`test-timezone.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_timezone-test-timezone.Tpo $(DEPDIR)/test_timezone-test-timezone.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-timezone.c' object='test_timezone-test-timezone.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -c -o test_timezone-test-timezone.o `test -f 'test-timezone.c' || echo '$(srcdir)/'`test-timezone.c - -test_timezone-test-timezone.obj: test-timezone.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -MT test_timezone-test-timezone.obj -MD -MP -MF $(DEPDIR)/test_timezone-test-timezone.Tpo -c -o test_timezone-test-timezone.obj `if test -f 'test-timezone.c'; then $(CYGPATH_W) 'test-timezone.c'; else $(CYGPATH_W) '$(srcdir)/test-timezone.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_timezone-test-timezone.Tpo $(DEPDIR)/test_timezone-test-timezone.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-timezone.c' object='test_timezone-test-timezone.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -c -o test_timezone-test-timezone.obj `if test -f 'test-timezone.c'; then $(CYGPATH_W) 'test-timezone.c'; else $(CYGPATH_W) '$(srcdir)/test-timezone.c'; fi` - -test_timezone-tz.o: tz.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -MT test_timezone-tz.o -MD -MP -MF $(DEPDIR)/test_timezone-tz.Tpo -c -o test_timezone-tz.o `test -f 'tz.c' || echo '$(srcdir)/'`tz.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_timezone-tz.Tpo $(DEPDIR)/test_timezone-tz.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz.c' object='test_timezone-tz.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -c -o test_timezone-tz.o `test -f 'tz.c' || echo '$(srcdir)/'`tz.c - -test_timezone-tz.obj: tz.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -MT test_timezone-tz.obj -MD -MP -MF $(DEPDIR)/test_timezone-tz.Tpo -c -o test_timezone-tz.obj `if test -f 'tz.c'; then $(CYGPATH_W) 'tz.c'; else $(CYGPATH_W) '$(srcdir)/tz.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_timezone-tz.Tpo $(DEPDIR)/test_timezone-tz.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tz.c' object='test_timezone-tz.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_timezone_CFLAGS) $(CFLAGS) -c -o test_timezone-tz.obj `if test -f 'tz.c'; then $(CYGPATH_W) 'tz.c'; else $(CYGPATH_W) '$(srcdir)/tz.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-dist_tzdataDATA: $(dist_tzdata_DATA) - @$(NORMAL_INSTALL) - test -z "$(tzdatadir)" || $(MKDIR_P) "$(DESTDIR)$(tzdatadir)" - @list='$(dist_tzdata_DATA)'; test -n "$(tzdatadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tzdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(tzdatadir)" || exit $$?; \ - done - -uninstall-dist_tzdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_tzdata_DATA)'; test -n "$(tzdatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(tzdatadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(tzdatadir)" && rm -f $$files -install-dist_uiDATA: $(dist_ui_DATA) - @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" - @list='$(dist_ui_DATA)'; test -n "$(uidir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ - done - -uninstall-dist_uiDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_ui_DATA)'; test -n "$(uidir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(uidir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local -check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) all-local -installdirs: - for dir in "$(DESTDIR)$(tzdatadir)" "$(DESTDIR)$(uidir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-dist_tzdataDATA install-dist_uiDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-dist_tzdataDATA uninstall-dist_uiDATA - -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \ - clean clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dist_tzdataDATA \ - install-dist_uiDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dist_tzdataDATA \ - uninstall-dist_uiDATA - - -all-local: check-local - -# FIXME remove "|| :" when we have all the necessary pixmaps -check-local: test-timezone - $(builddir)/test-timezone $(srcdir)/data || : - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index e69d58b..2435eff 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -30,6 +30,7 @@ with this program. If not, see . #include #include #include +#include #include #include #include @@ -426,6 +427,32 @@ timezone_selected (GtkEntryCompletion * widget, GtkTreeModel * model, return FALSE; // Do normal action too } +static gboolean +key_pressed (GtkWidget * widget, GdkEventKey * event, gpointer user_data) +{ + switch (event->keyval) { + case GDK_KEY_Escape: + gtk_widget_destroy (widget); + return TRUE; + } + return FALSE; +} + +static GtkWidget * +get_child_of_type (GtkContainer * parent, GType type) +{ + GList * children, * iter; + + children = gtk_container_get_children (parent); + for (iter = children; iter; iter = iter->next) { + if (G_TYPE_CHECK_INSTANCE_TYPE (iter->data, type)) { + return GTK_WIDGET (iter->data); + } + } + + return NULL; +} + static GtkWidget * create_dialog (void) { @@ -451,6 +478,11 @@ create_dialog (void) polkit_lock_button_set_unlock_text (POLKIT_LOCK_BUTTON (polkit_button), _("Unlock to change these settings")); polkit_lock_button_set_lock_text (POLKIT_LOCK_BUTTON (polkit_button), _("Lock to prevent further changes")); gtk_box_pack_start (GTK_BOX (WIG ("timeDateBox")), polkit_button, FALSE, TRUE, 0); + /* Make sure border around button is visible */ + GtkWidget * polkit_button_button = get_child_of_type (GTK_CONTAINER (polkit_button), GTK_TYPE_BUTTON); + if (polkit_button_button != NULL) { + gtk_button_set_relief (GTK_BUTTON (polkit_button_button), GTK_RELIEF_NORMAL); + } /* Add map */ tzmap = cc_timezone_map_new (); @@ -513,6 +545,7 @@ create_dialog (void) tz_entry = WIG ("timezoneEntry"); g_signal_connect (WIG ("locationsButton"), "clicked", G_CALLBACK (show_locations), dlg); + g_signal_connect (dlg, "key-press-event", G_CALLBACK (key_pressed), NULL); /* Grab proxy for settings daemon */ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE, NULL, @@ -565,7 +598,7 @@ main (int argc, char ** argv) unique_app_watch_window (app, GTK_WINDOW (dlg)); gtk_widget_show_all (dlg); - g_signal_connect (dlg, "response", G_CALLBACK(gtk_main_quit), NULL); + g_signal_connect (dlg, "destroy", G_CALLBACK(gtk_main_quit), NULL); gtk_main (); } -- cgit v1.2.3 From 55736aa91ce77af6127ec115860cb2379158d48b Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 3 Mar 2011 09:44:42 -0500 Subject: add back missing unref --- src/datetime-prefs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index b6fd1c9..901c290 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -304,6 +304,7 @@ input_time_text (GtkWidget * spinner, gdouble * value, gpointer user_data) hour = g_date_time_get_hour (now); minute = g_date_time_get_minute (now); second = g_date_time_get_second (now); + g_date_time_unref (now); /* Parse this string as if it were in the output format */ gint scanned = 0; -- cgit v1.2.3 From cd4699a975d0c019d0143d26cfaa0758af1e655f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 3 Mar 2011 13:14:14 -0500 Subject: quit when the close putton is clicked --- src/datetime-prefs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c index cb38c24..5248911 100644 --- a/src/datetime-prefs.c +++ b/src/datetime-prefs.c @@ -678,6 +678,7 @@ main (int argc, char ** argv) unique_app_watch_window (app, GTK_WINDOW (dlg)); gtk_widget_show_all (dlg); + g_signal_connect (dlg, "response", G_CALLBACK(gtk_main_quit), NULL); g_signal_connect (dlg, "destroy", G_CALLBACK(gtk_main_quit), NULL); gtk_main (); } -- cgit v1.2.3 From 8a5b40e906646c1b3616855ed8b04f3e4283a604 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 14:33:04 -0600 Subject: 0.1.96 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a762ea8..8764120 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-datetime, 0.1.95, ted@canonical.com) +AC_INIT(indicator-datetime, 0.1.96, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-datetime, 0.1.95) +AM_INIT_AUTOMAKE(indicator-datetime, 0.1.96) AM_MAINTAINER_MODE -- cgit v1.2.3