Merge tag 'upstream/1.1.1'

[psensor-pkg-ubuntu.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 53aa4fb..6876600 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -84,7 +84,7 @@ void ui_show_about_dialog()
                 _("Psensor is a GTK+ application for monitoring hardware "
                   "sensors"),
                 "copyright",
-                _("Copyright(c) 2010-2013\njeanfi@gmail.com"),
+                _("Copyright(c) 2010-2014\njeanfi@gmail.com"),
                 "logo-icon-name", "psensor",
                 "program-name", "Psensor",
                 "title", _("About Psensor"),
@@ -152,8 +152,7 @@ void ui_enable_alpha_channel(struct ui_psensor *ui)
        }
 }
 
-static void
-slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer data)
+static void slog_enabled_cbk(void *data)
 {
        struct ui_psensor *ui;
        struct psensor **sensors;
@@ -203,7 +202,7 @@ void ui_window_create(struct ui_psensor *ui)
                                cfg->window_x,
                                cfg->window_y);
 
-       config_slog_enabled_notify_add(slog_enabled_cbk, ui);
+       config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui);
 
        gtk_window_set_default_size(GTK_WINDOW(window),
                                    cfg->window_w,