From 575f35df7aab6aa6a17c744655ae4490eea1cbc2 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Sun, 6 Nov 2005 03:07:21 +0000 Subject: [PATCH] Cleanup usage of the PLUGIN_PAGE_LABEL define. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11849 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 7 +++++++ src/gnome-utils/gnc-embedded-window.c | 1 - src/gnome-utils/gnc-embedded-window.h | 2 -- src/gnome-utils/gnc-main-window.c | 3 +++ src/gnome-utils/gnc-main-window.h | 2 -- src/gnome-utils/gnc-window.h | 2 -- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74d8c513e7..341ad36fbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-11-05 David Hampton + * src/gnome-utils/gnc-embedded-window.c: + * src/gnome-utils/gnc-embedded-window.h: + * src/gnome-utils/gnc-main-window.c: + * src/gnome-utils/gnc-main-window.h: + * src/gnome-utils/gnc-window.h: Cleanup usage of the + PLUGIN_PAGE_LABEL define. + * Various: Convert to newer method of allocating private data structures for objects. This allows glib to consolidate the space for all of the various public and private data structures on an diff --git a/src/gnome-utils/gnc-embedded-window.c b/src/gnome-utils/gnc-embedded-window.c index 66ac7f3f4f..e6fb3e4c16 100644 --- a/src/gnome-utils/gnc-embedded-window.c +++ b/src/gnome-utils/gnc-embedded-window.c @@ -121,7 +121,6 @@ gnc_embedded_window_open_page (GncEmbeddedWindow *window, priv->page = page; page->window = GTK_WIDGET(window); page->notebook_page = gnc_plugin_page_create_widget (page); - g_object_set_data (G_OBJECT (page->notebook_page), PLUGIN_PAGE_LABEL, page); gtk_box_pack_end(GTK_BOX(window), page->notebook_page, TRUE, TRUE, 2); gnc_plugin_page_inserted (page); diff --git a/src/gnome-utils/gnc-embedded-window.h b/src/gnome-utils/gnc-embedded-window.h index 54c66284c4..9ecbef4596 100644 --- a/src/gnome-utils/gnc-embedded-window.h +++ b/src/gnome-utils/gnc-embedded-window.h @@ -42,8 +42,6 @@ G_BEGIN_DECLS -#define PLUGIN_PAGE_LABEL "plugin-page" - /* type macros */ #define GNC_TYPE_EMBEDDED_WINDOW (gnc_embedded_window_get_type ()) #define GNC_EMBEDDED_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_EMBEDDED_WINDOW, GncEmbeddedWindow)) diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index 7d1f7f50b6..3b091a8720 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -67,6 +67,9 @@ enum { LAST_SIGNAL }; +/** This label is used to provide a mapping from a visible page widget + * back to the corresponding GncPluginPage object. */ +#define PLUGIN_PAGE_LABEL "plugin-page" #define PLUGIN_PAGE_IMMUTABLE "page-immutable" #define PLUGIN_PAGE_CLOSE_BUTTON "close-button" diff --git a/src/gnome-utils/gnc-main-window.h b/src/gnome-utils/gnc-main-window.h index a5c2081186..ff123c43fc 100644 --- a/src/gnome-utils/gnc-main-window.h +++ b/src/gnome-utils/gnc-main-window.h @@ -42,8 +42,6 @@ G_BEGIN_DECLS -#define PLUGIN_PAGE_LABEL "plugin-page" - /* type macros */ #define GNC_TYPE_MAIN_WINDOW (gnc_main_window_get_type ()) #define GNC_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNC_TYPE_MAIN_WINDOW, GncMainWindow)) diff --git a/src/gnome-utils/gnc-window.h b/src/gnome-utils/gnc-window.h index df77f4553a..e73f66c1d0 100644 --- a/src/gnome-utils/gnc-window.h +++ b/src/gnome-utils/gnc-window.h @@ -46,8 +46,6 @@ G_BEGIN_DECLS -#define PLUGIN_PAGE_LABEL "plugin-page" - /* type macros */ #define GNC_TYPE_WINDOW (gnc_window_get_type ()) #define GNC_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNC_TYPE_WINDOW, GncWindow))