initial cut for syncing panel with c++ changes. this is broken.

1 files changed, 11 insertions, 11 deletions

diff --git a/panel/datetime-prefs-locations.c b/panel/datetime-prefs-locations.c
index 54ab8f4..b79c014 100644
--- a/panel/datetime-prefs-locations.c
+++ b/panel/datetime-prefs-locations.c
@@ -24,15 +24,18 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <time.h> /* time_t */
+#include "datetime-prefs-locations.h"
+
+#include <datetime/settings-shared.h>
+#include <datetime/utils.h>
+
+#include <timezonemap/timezone-completion.h>
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <timezonemap/timezone-completion.h>
 
-#include "datetime-prefs-locations.h"
-#include "settings-shared.h"
-#include "utils.h"
+#include <stdlib.h>
+#include <time.h> /* time_t */
 
 #define DATETIME_DIALOG_UI_FILE PKGDATADIR "/datetime-dialog.ui"
 
@@ -310,7 +313,7 @@ handle_edit (GtkCellRendererText * renderer G_GNUC_UNUSED,
 
     gtk_list_store_set (store, &iter,
                         COL_VISIBLE_NAME, new_text,
-                        COL_ICON, correct ? NULL : GTK_STOCK_DIALOG_ERROR,
+                        COL_ICON, correct ? NULL : "dialog-error",
                         -1);
   }
 }
@@ -425,7 +428,6 @@ update_times (GtkWidget * dlg)
 
   g_signal_handlers_block_by_func (store, save_when_idle, dlg);
 
-  GSettings * settings = g_settings_new (SETTINGS_INTERFACE);
   GtkTreeIter iter;
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) {
     GDateTime * now = g_date_time_new_now_local ();
@@ -437,7 +439,7 @@ update_times (GtkWidget * dlg)
       if (strzone && *strzone) {
         GTimeZone * tz = g_time_zone_new (strzone);
         GDateTime * now_tz = g_date_time_to_timezone (now, tz);
-        gchar * format = generate_full_format_string_at_time (now, now_tz, settings);
+        gchar * format = generate_full_format_string_at_time (now, now_tz);
         gchar * time_str = g_date_time_format (now_tz, format);
         gchar * old_time_str;
 
@@ -456,8 +458,6 @@ update_times (GtkWidget * dlg)
     g_date_time_unref (now);
   }
 
-  g_object_unref (settings);
-
   g_signal_handlers_unblock_by_func (store, save_when_idle, dlg);
 
   return TRUE;