Sjoerd Langkemper's <sjoerd-gnome at linuxonly.nl> fixes to cast

sentinel markers to pointers.  Solves compilation problems on 64 bit
architectures using gcc4/glib2.6.  Fixes #321316.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11963 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,26 @@
+2005-11-16    <david@hampton-pc.rainbolthampton.net>
+
+	* src/import-export/qif-import/dialog-account-picker.c:
+	* src/business/business-gnome/dialog-vendor.c:
+	* src/business/business-gnome/gnc-plugin-business.c:
+	* src/business/business-gnome/dialog-customer.c:
+	* src/business/business-gnome/dialog-job.c:
+	* src/business/business-gnome/gnc-plugin-page-invoice.c:
+	* src/business/business-gnome/dialog-employee.c:
+	* src/business/business-gnome/business-options-gnome.c:
+	* src/business/business-gnome/dialog-invoice.c:
+	* src/gnome-utils/druid-gconf-setup.c:
+	* src/gnome-utils/gnc-gnome-utils.c:
+	* src/gnome-utils/gnc-main-window.c:
+	* src/gnome-utils/dialog-utils.c:
+	* src/gnome/druid-hierarchy.c: Sjoerd Langkemper's <sjoerd-gnome
+	at linuxonly.nl> fixes to cast sentinel markers to pointers.
+	Solves compilation problems on 64 bit architectures using
+	gcc4/glib2.6.  Fixes #321316.
+
+	* lib/goffice/gui-utils/go-combo-text.c: Remove unused call to
+	g_object_set.
+
 2005-11-16  Christian Stimming  <stimming@tuhh.de>
 
 	* ChangeLog: Split top-level ChangeLog by year. Everything before

src/business/business-gnome/business-options-gnome.c

@@ -77,7 +77,7 @@ make_name_label (char *name)
   GtkWidget *label;
   gchar *colon_name;
 
-  colon_name = g_strconcat (name, ":", NULL);
+  colon_name = g_strconcat (name, ":", (char *)NULL);
   label = gtk_label_new (colon_name);
   gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
   g_free (colon_name);

src/business/business-gnome/dialog-customer.c

@@ -365,12 +365,12 @@ gnc_customer_name_changed_cb (GtkWidget *widget, gpointer data)
 
   id = gtk_entry_get_text (GTK_ENTRY (cw->id_entry));
 
-  fullname = g_strconcat (name, " (", id, ")", NULL);
+  fullname = g_strconcat (name, " (", id, ")", (char *)NULL);
 
   if (cw->dialog_type == EDIT_CUSTOMER)
-    title = g_strconcat (_("Edit Customer"), " - ", fullname, NULL);
+    title = g_strconcat (_("Edit Customer"), " - ", fullname, (char *)NULL);
   else
-    title = g_strconcat (_("New Customer"), " - ", fullname, NULL);
+    title = g_strconcat (_("New Customer"), " - ", fullname, (char *)NULL);
 
   gtk_window_set_title (GTK_WINDOW (cw->dialog), title);
 

src/business/business-gnome/dialog-employee.c

@@ -301,12 +301,12 @@ gnc_employee_name_changed_cb (GtkWidget *widget, gpointer data)
 
   id = gtk_entry_get_text (GTK_ENTRY (ew->id_entry));
 
-  fullname = g_strconcat (name, " (", id, ")", NULL);
+  fullname = g_strconcat (name, " (", id, ")", (char *)NULL);
 
   if (ew->dialog_type == EDIT_EMPLOYEE)
-    title = g_strconcat (_("Edit Employee"), " - ", fullname, NULL);
+    title = g_strconcat (_("Edit Employee"), " - ", fullname, (char *)NULL);
   else
-    title = g_strconcat (_("New Employee"), " - ", fullname, NULL);
+    title = g_strconcat (_("New Employee"), " - ", fullname, (char *)NULL);
 
   gtk_window_set_title (GTK_WINDOW (ew->dialog), title);
 

src/business/business-gnome/dialog-invoice.c

@@ -491,7 +491,7 @@ gnc_invoice_window_deleteCB (GtkWidget *widget, gpointer data)
     gboolean result;
 
     if (gncEntryGetOrder (entry))
-      msg = g_strconcat (message, "\n\n", order_warn, NULL);
+      msg = g_strconcat (message, "\n\n", order_warn, (char *)NULL);
     else
       msg = g_strdup (message);
 
@@ -1573,7 +1573,7 @@ gnc_invoice_get_title (InvoiceWindow *iw)
   if (iw->id_entry)
     id = gtk_entry_get_text (GTK_ENTRY (iw->id_entry));
   if (id && *id)
-    return g_strconcat (wintitle, " - ", id, NULL);
+    return g_strconcat (wintitle, " - ", id, (char *)NULL);
   return g_strdup (wintitle);
 }
 

src/business/business-gnome/dialog-job.c

@@ -230,12 +230,12 @@ gnc_job_name_changed_cb (GtkWidget *widget, gpointer data)
 
   id = gtk_entry_get_text (GTK_ENTRY (jw->id_entry));
 
-  fullname = g_strconcat (name, " (", id, ")", NULL);
+  fullname = g_strconcat (name, " (", id, ")", (char *)NULL);
 
   if (jw->dialog_type == EDIT_JOB)
-    title = g_strconcat (_("Edit Job"), " - ", fullname, NULL);
+    title = g_strconcat (_("Edit Job"), " - ", fullname, (char *)NULL);
   else
-    title = g_strconcat (_("New Job"), " - ", fullname, NULL);
+    title = g_strconcat (_("New Job"), " - ", fullname, (char *)NULL);
 
   gtk_window_set_title (GTK_WINDOW (jw->dialog), title);
 

src/business/business-gnome/dialog-vendor.c

@@ -287,12 +287,12 @@ gnc_vendor_name_changed_cb (GtkWidget *widget, gpointer data)
 
   id = gtk_editable_get_chars (GTK_EDITABLE (vw->id_entry), 0, -1);
 
-  fullname = g_strconcat (name, " (", id, ")", NULL);
+  fullname = g_strconcat (name, " (", id, ")", (char *)NULL);
 
   if (vw->dialog_type == EDIT_VENDOR)
-    title = g_strconcat (_("Edit Vendor"), " - ", fullname, NULL);
+    title = g_strconcat (_("Edit Vendor"), " - ", fullname, (char *)NULL);
   else
-    title = g_strconcat (_("New Vendor"), " - ", fullname, NULL);
+    title = g_strconcat (_("New Vendor"), " - ", fullname, (char *)NULL);
 
   gtk_window_set_title (GTK_WINDOW (vw->dialog), title);
 

src/business/business-gnome/gnc-plugin-business.c

@@ -309,7 +309,7 @@ gnc_plugin_business_new (void)
 	GNC_TYPE_PLUGIN_PAGE_INVOICE;
 
 	plugin = g_object_new (GNC_TYPE_PLUGIN_BUSINESS,
-			      NULL);
+			      (char *)NULL);
 
 	return GNC_PLUGIN (plugin);
 }

src/business/business-gnome/gnc-plugin-page-invoice.c

@@ -261,7 +261,7 @@ gnc_plugin_page_invoice_new (InvoiceWindow *iw)
 	    return GNC_PLUGIN_PAGE(invoice_page);
 	}
 
-	invoice_page = g_object_new (GNC_TYPE_PLUGIN_PAGE_INVOICE, NULL);
+	invoice_page = g_object_new (GNC_TYPE_PLUGIN_PAGE_INVOICE, (char *)NULL);
 	priv = GNC_PLUGIN_PAGE_INVOICE_GET_PRIVATE(invoice_page);
 	priv->iw = iw;
 
@@ -310,7 +310,7 @@ gnc_plugin_page_invoice_init (GncPluginPageInvoice *plugin_page)
 		     "page-uri",       "default:",
 		     "ui-description", "gnc-plugin-page-invoice-ui.xml",
 		     "use-new-window", use_new,
-		     NULL);
+		     (char *)NULL);
 
 	/* change me when the system supports multiple books */
 	gnc_plugin_page_add_book(parent, gnc_get_current_book());

src/gnome-utils/dialog-utils.c

@@ -895,7 +895,7 @@ gnc_glade_xml_new (const char *filename, const char *root)
     glade_inited = TRUE;
   }
 
-  fname = g_strconcat (GNC_GLADE_DIR, "/", filename, NULL);
+  fname = g_strconcat (GNC_GLADE_DIR, "/", filename, (char *)NULL);
 
   xml = glade_xml_new (fname, root, NULL);
 

src/gnome-utils/druid-gconf-setup.c

@@ -115,8 +115,8 @@ druid_gconf_update_path (GError **error)
   gboolean found_user_dir = FALSE;
   FILE *output;
 
-  data_filename = g_strjoin("/", g_getenv("HOME"), ".gconf", NULL);
+  data_filename = g_strjoin("/", g_getenv("HOME"), ".gconf", (char *)NULL);
-  path_filename = g_strjoin("/", g_getenv("HOME"), ".gconf.path", NULL);
+  path_filename = g_strjoin("/", g_getenv("HOME"), ".gconf.path", (char *)NULL);
   if (g_file_test(path_filename, G_FILE_TEST_EXISTS)) {
     if (!g_file_get_contents(path_filename, &contents, NULL, error)) {
       g_free(path_filename);

src/gnome-utils/gnc-gnome-utils.c

@@ -127,7 +127,7 @@ gnc_gtk_add_rc_file (void)
 
   var = g_get_home_dir ();
   if (var) {
-    str = g_build_filename (var, ".gtkrc-2.0.gnucash", NULL);
+    str = g_build_filename (var, ".gtkrc-2.0.gnucash", (char *)NULL);
     gtk_rc_add_default_file (str);
     g_free (str);
   }

src/gnome-utils/gnc-main-window.c

@@ -1173,7 +1173,7 @@ gnc_main_window_update_one_menu_action (GncMainWindow *window,
     g_object_set(G_OBJECT(action),
 		 "label", data->label,
 		 "visible", data->visible,
-		 NULL);
+		 (char *)NULL);
   LEAVE(" ");
 }
 
@@ -2312,7 +2312,7 @@ gnc_main_window_setup_window (GncMainWindow *window)
 	g_object_set(G_OBJECT(priv->notebook),
 			      "scrollable", TRUE,
 			      "enable-popup", TRUE,
-			      NULL);
+			      (char *)NULL);
 	gtk_widget_show (priv->notebook);
 	g_signal_connect (G_OBJECT (priv->notebook), "switch-page",
 			  G_CALLBACK (gnc_main_window_switch_page), window);
@@ -2387,7 +2387,7 @@ gnc_main_window_setup_window (GncMainWindow *window)
 	  GtkAction*  action;
 
 	  action = gtk_action_group_get_action(priv->action_group,"ExtensionsAction");
-	  g_object_set(G_OBJECT(action), "visible", FALSE, NULL);
+	  g_object_set(G_OBJECT(action), "visible", FALSE, (char *)NULL);
 	}
 
 	/* GncPluginManager stuff */

src/gnome/druid-hierarchy.c

@@ -639,7 +639,7 @@ balance_cell_data_func (GtkTreeViewColumn *tree_column,
 
 	g_object_set (G_OBJECT (cell),
 		      "text", string,
-		      NULL);
+		      (char *)NULL);
 }
 
 static void
@@ -740,7 +740,7 @@ on_final_account_prepare (GnomeDruidPage  *gnomedruidpage,
   renderer = gtk_cell_renderer_text_new ();
   g_object_set (G_OBJECT (renderer),
 		"xalign", 1.0,
-		NULL);
+		(char *)NULL);
   column = gtk_tree_view_column_new_with_attributes (_("Opening Balance"),
 						     renderer,
 						     NULL);

src/import-export/qif-import/dialog-account-picker.c

@@ -91,7 +91,7 @@ acct_tree_add_accts(SCM accts, GtkCTree * tree, GtkCTreeNode * parent,
 
     /* set some row data */ 
     if(base_name && (strlen(base_name) > 0)) {
-      acctname =  g_strjoin(sep, base_name, acctinfo[0], NULL);
+      acctname =  g_strjoin(sep, base_name, acctinfo[0], (char *)NULL);
     }
     else {
       acctname = g_strdup(acctinfo[0]);
@@ -173,7 +173,7 @@ gnc_ui_qif_account_picker_new_cb(GtkButton * w, gpointer user_data)
     name = gtk_entry_get_text(GTK_ENTRY(entry));
     if(wind->selected_name && (strlen(wind->selected_name) > 0)) {
       sep[0] = gnc_get_account_separator();
-      fullname = g_strjoin(sep, wind->selected_name, name, NULL);
+      fullname = g_strjoin(sep, wind->selected_name, name, (char *)NULL);
     }
     else {
       fullname = g_strdup(name);