Gnc-Prefs: cleanup gconf wiring in main summarybar

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23257 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2013-10-07 14:25:39 +00:00
parent 8e630049a3
commit 5674f4ed21

View File

@ -33,7 +33,6 @@
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-euro.h" #include "gnc-euro.h"
#include "gnc-event.h" #include "gnc-event.h"
#include "gnc-gconf-utils.h"
#include "gnc-prefs.h" #include "gnc-prefs.h"
#include "gnc-locale-utils.h" #include "gnc-locale-utils.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"
@ -50,9 +49,6 @@ typedef struct
#define WINDOW_SUMMARYBAR_CM_CLASS "summary-bar" #define WINDOW_SUMMARYBAR_CM_CLASS "summary-bar"
#define GCONF_SECTION "window/pages/account_tree/summary"
#define KEY_NON_CURRENCY "non_currency"
#define GNC_PREFS_GROUP "window.pages.account_tree.summary" #define GNC_PREFS_GROUP "window.pages.account_tree.summary"
#define GNC_PREF_GRAND_TOTAL "grand_total" #define GNC_PREF_GRAND_TOTAL "grand_total"
#define GNC_PREF_NON_CURRENCY "non_currency" #define GNC_PREF_NON_CURRENCY "non_currency"
@ -448,7 +444,7 @@ gnc_main_window_summary_refresh (GNCMainSummary * summary)
static void static void
gnc_main_window_summary_destroy_cb(GNCMainSummary *summary, gpointer data) gnc_main_window_summary_destroy_cb(GNCMainSummary *summary, gpointer data)
{ {
gnc_gconf_remove_anon_notification(GCONF_SECTION, summary->cnxn_id); gnc_prefs_remove_cb_by_id (GNC_PREFS_GROUP, summary->cnxn_id);
gnc_unregister_gui_component(summary->component_id); gnc_unregister_gui_component(summary->component_id);
g_free(summary); g_free(summary);
} }
@ -461,10 +457,7 @@ summarybar_refresh_handler(GHashTable * changes, gpointer user_data)
} }
static void static void
gconf_client_notify_cb (GConfClient *client, prefs_changed_cb (gpointer prefs, gchar *pref, gpointer user_data)
guint cnxn_id,
GConfEntry *entry,
gpointer user_data)
{ {
GNCMainSummary * summary = user_data; GNCMainSummary * summary = user_data;
gnc_main_window_summary_refresh(summary); gnc_main_window_summary_refresh(summary);
@ -518,9 +511,8 @@ gnc_main_window_summary_new (void)
gnc_main_window_summary_refresh(retval); gnc_main_window_summary_refresh(retval);
retval->cnxn_id = gnc_gconf_add_anon_notification(GCONF_SECTION, retval->cnxn_id = gnc_prefs_register_cb (GNC_PREFS_GROUP, NULL,
gconf_client_notify_cb, prefs_changed_cb, retval);
retval);
return retval->hbox; return retval->hbox;
} }