r20596 - gnucash/trunk/src - Remove unwanted use of G_MODULE_EXPORT again from the new gtkbuilder

Geert Janssens gjanssens at code.gnucash.org
Tue Apr 26 14:42:58 EDT 2011


Author: gjanssens
Date: 2011-04-26 14:42:57 -0400 (Tue, 26 Apr 2011)
New Revision: 20596
Trac: http://svn.gnucash.org/trac/changeset/20596

Modified:
   gnucash/trunk/src/gnome-utils/dialog-account.c
   gnucash/trunk/src/gnome/assistant-hierarchy.c
Log:
Remove unwanted use of G_MODULE_EXPORT again from the new gtkbuilder
based widget callback routines.

Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c	2011-04-23 20:33:06 UTC (rev 20595)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c	2011-04-26 18:42:57 UTC (rev 20596)
@@ -57,16 +57,6 @@
 
 #define GCONF_SECTION "dialogs/new_hierarchy"
 
-#ifdef G_MODULE_EXPORT
-/* No separate marking of functions as "DLL export", please: The rest
- * of gnucash relies on *everything* being exported.  As soon as at
- * least one function is manually marked as export, nothing except
- * those marked functions are exported, which will break the build on
- * Windows. */
-# undef G_MODULE_EXPORT
-# define G_MODULE_EXPORT
-#endif
-
 typedef enum
 {
     COL_CHECKED,
@@ -110,16 +100,16 @@
 
 } hierarchy_data;
 
-G_MODULE_EXPORT void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
+void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
         hierarchy_data  *data);
 void on_choose_account_categories_prepare (hierarchy_data  *data);
-G_MODULE_EXPORT void select_all_clicked (GtkButton       *button,
+void select_all_clicked (GtkButton       *button,
                          hierarchy_data  *data);
-G_MODULE_EXPORT void clear_all_clicked (GtkButton       *button,
+void clear_all_clicked (GtkButton       *button,
                         hierarchy_data  *data);
 void on_final_account_prepare (hierarchy_data  *data);
-G_MODULE_EXPORT void on_cancel (GtkAssistant      *gtkassistant, hierarchy_data *data);
-G_MODULE_EXPORT void on_finish (GtkAssistant  *gtkassistant, hierarchy_data *data);
+void on_cancel (GtkAssistant      *gtkassistant, hierarchy_data *data);
+void on_finish (GtkAssistant  *gtkassistant, hierarchy_data *data);
 
 // ------------------------------------------------------------
 
@@ -437,7 +427,7 @@
     }
 }
 
-G_MODULE_EXPORT void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
+void on_prepare (GtkAssistant  *assistant, GtkWidget *page,
         hierarchy_data  *data)
 {
     gint currentpage = gtk_assistant_get_current_page(assistant);
@@ -553,7 +543,7 @@
     return FALSE;  /* Run entire tree */
 }
 
-G_MODULE_EXPORT void
+void
 select_all_clicked (GtkButton       *button,
                     hierarchy_data  *data)
 {
@@ -562,7 +552,7 @@
                             GINT_TO_POINTER(TRUE));
 }
 
-G_MODULE_EXPORT void
+void
 clear_all_clicked (GtkButton       *button,
                    hierarchy_data  *data)
 {
@@ -989,7 +979,7 @@
     gnc_resume_gui_refresh ();
 }
 
-G_MODULE_EXPORT void
+void
 on_cancel (GtkAssistant      *gtkassistant,
            hierarchy_data  *data)
 {
@@ -1014,7 +1004,7 @@
                                             gnc_get_current_book ());
 }
 
-G_MODULE_EXPORT void
+void
 on_finish (GtkAssistant  *gtkassistant,
            hierarchy_data  *data)
 {

Modified: gnucash/trunk/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-account.c	2011-04-23 20:33:06 UTC (rev 20595)
+++ gnucash/trunk/src/gnome-utils/dialog-account.c	2011-04-26 18:42:57 UTC (rev 20596)
@@ -56,16 +56,6 @@
 #define GCONF_SECTION "dialogs/account"
 #define DEFAULT_COLOR "#ededececebeb"
 
-#ifdef G_MODULE_EXPORT
-/* No separate marking of functions as "DLL export", please: The rest
- * of gnucash relies on *everything* being exported.  As soon as at
- * least one function is manually marked as export, nothing except
- * those marked functions are exported, which will break the build on
- * Windows. */
-# undef G_MODULE_EXPORT
-# define G_MODULE_EXPORT
-#endif
-
 enum account_cols
 {
     ACCOUNT_COL_FULLNAME = 0,
@@ -156,11 +146,11 @@
 void gnc_account_renumber_interval_changed_cb (GtkSpinButton *spinbutton, RenumberDialog *data);
 void gnc_account_renumber_response_cb (GtkDialog *dialog, gint response, RenumberDialog *data);
 
-G_MODULE_EXPORT void gnc_account_window_destroy_cb (GtkObject *object, gpointer data);
-G_MODULE_EXPORT void opening_equity_cb (GtkWidget *w, gpointer data);
-G_MODULE_EXPORT void gnc_account_name_changed_cb(GtkWidget *widget, gpointer data);
-G_MODULE_EXPORT void gnc_account_color_default_cb(GtkWidget *widget, gpointer data);
-G_MODULE_EXPORT void gnc_account_name_insert_text_cb (GtkWidget   *entry,
+void gnc_account_window_destroy_cb (GtkObject *object, gpointer data);
+void opening_equity_cb (GtkWidget *w, gpointer data);
+void gnc_account_name_changed_cb(GtkWidget *widget, gpointer data);
+void gnc_account_color_default_cb(GtkWidget *widget, gpointer data);
+void gnc_account_name_insert_text_cb (GtkWidget   *entry,
                                                       const gchar *text,
                                                       gint         length,
                                                       gint        *position,
@@ -728,7 +718,7 @@
 }
 
 
-G_MODULE_EXPORT static gboolean
+static gboolean
 gnc_filter_parent_accounts (Account *account, gpointer data)
 {
     AccountWindow *aw = data;
@@ -928,7 +918,7 @@
     LEAVE(" ");
 }
 
-G_MODULE_EXPORT static void
+static void
 gnc_account_window_response_cb (GtkDialog *dialog,
                                 gint response,
                                 gpointer data)
@@ -979,7 +969,7 @@
     LEAVE(" ");
 }
 
-G_MODULE_EXPORT void
+void
 gnc_account_window_destroy_cb (GtkObject *object, gpointer data)
 {
     AccountWindow *aw = data;
@@ -1028,7 +1018,7 @@
     LEAVE(" ");
 }
 
-G_MODULE_EXPORT static void
+static void
 gnc_account_parent_changed_cb (GtkTreeSelection *selection, gpointer data)
 {
     AccountWindow *aw = data;
@@ -1090,7 +1080,7 @@
     gnc_account_window_set_name(aw);
 }
 
-G_MODULE_EXPORT static void
+static void
 gnc_account_type_changed_cb (GtkTreeSelection *selection, gpointer data)
 {
     AccountWindow *aw = data;
@@ -1188,7 +1178,7 @@
     gnc_tree_model_account_types_set_selection(selection, 1 << aw->type);
 }
 
-G_MODULE_EXPORT void
+void
 gnc_account_name_insert_text_cb (GtkWidget   *entry,
                                  const gchar *text,
                                  gint         length,
@@ -1218,7 +1208,7 @@
     g_strfreev ( strsplit );
 }
 
-G_MODULE_EXPORT void
+void
 gnc_account_name_changed_cb(GtkWidget *widget, gpointer data)
 {
     AccountWindow *aw = data;
@@ -1226,7 +1216,7 @@
     gnc_account_window_set_name (aw);
 }
 
-G_MODULE_EXPORT void
+void
 gnc_account_color_default_cb(GtkWidget *widget, gpointer data)
 {
     GdkColor color;
@@ -1237,7 +1227,7 @@
 
 }
 
-G_MODULE_EXPORT static void
+static void
 commodity_changed_cb (GNCGeneralSelect *gsl, gpointer data)
 {
     AccountWindow *aw = data;
@@ -1290,7 +1280,7 @@
     return gnc_commodity_equiv (xaccAccountGetCommodity (account), commodity);
 }
 
-G_MODULE_EXPORT void
+void
 opening_equity_cb (GtkWidget *w, gpointer data)
 {
     AccountWindow *aw = data;



More information about the gnucash-changes mailing list