GNOME.org
 

[gnome-db] Removed warnings in libgnomedb. Patch.

	This patch removes all the compilation warnings in libgnomedb.

	Please, verify the changes and tell me if there is something
	wrong.

	Bye!

-- 
Gonzalo Paniagua Javier <gonzalo gnome-db org>
http://www.gnome-db.org/~gonzalo/


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libgnomedb/ChangeLog,v
retrieving revision 1.35
diff -u -r1.35 ChangeLog
--- ChangeLog	2002/01/26 23:56:38	1.35
+++ ChangeLog	2002/01/28 21:42:20
@@ -1,3 +1,24 @@
+2002-01-28  Gonzalo Paniagua Javier <gonzalo gnome-db org>
+
+	* doc/C/tmpl/gnome-db-model.sgml:
+	* doc/C/tmpl/gnome-db-util.sgml:
+	* libgnomedb/gnome-db-browser-procedures.c:
+	* libgnomedb/gnome-db-browser-types.c:
+	* libgnomedb/gnome-db-control-widget.c:
+	* libgnomedb/gnome-db-control.c:
+	* libgnomedb/gnome-db-dsn-config-druid.c:
+	* libgnomedb/gnome-db-error-dialog.c:
+	* libgnomedb/gnome-db-error.c:
+	* libgnomedb/gnome-db-gray-bar.c:
+	* libgnomedb/gnome-db-grid.c:
+	* libgnomedb/gnome-db-init.c:
+	* libgnomedb/gnome-db-intl.h:
+	* libgnomedb/gnome-db-list.c:
+	* libgnomedb/gnome-db-login.c:
+	* libgnomedb/gnome-db-util.c:
+	* libgnomedb/gnome-db-window.c:
+	* testing/test-grid.c: removed compile warnings.
+
 2002-01-27  Rodrigo Moya <rodrigo gnome-db org>
 
 	* libgnomedb/gnome-db-dsn-config.c (gnome_db_dsn_config_get_info):
Index: doc/C/tmpl/gnome-db-model.sgml
===================================================================
RCS file: /cvs/gnome/libgnomedb/doc/C/tmpl/gnome-db-model.sgml,v
retrieving revision 1.2
diff -u -r1.2 gnome-db-model.sgml
--- doc/C/tmpl/gnome-db-model.sgml	2001/12/27 21:06:13	1.2
+++ doc/C/tmpl/gnome-db-model.sgml	2002/01/28 21:42:20
@@ -14,12 +14,3 @@
 
 </para>
 
-<!-- ##### FUNCTION gnome_db_model_to_gtk_tree_model ##### -->
-<para>
-
-</para>
-
- model: 
- Returns: 
-
-
Index: doc/C/tmpl/gnome-db-util.sgml
===================================================================
RCS file: /cvs/gnome/libgnomedb/doc/C/tmpl/gnome-db-util.sgml,v
retrieving revision 1.3
diff -u -r1.3 gnome-db-util.sgml
--- doc/C/tmpl/gnome-db-util.sgml	2001/12/30 16:40:48	1.3
+++ doc/C/tmpl/gnome-db-util.sgml	2002/01/28 21:42:20
@@ -90,6 +90,8 @@
 
 </para>
 
+ homogenous: 
+ spacing: 
 @Returns: 
 
 
Index: libgnomedb/gnome-db-browser-procedures.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-browser-procedures.c,v
retrieving revision 1.2
diff -u -r1.2 gnome-db-browser-procedures.c
--- libgnomedb/gnome-db-browser-procedures.c	2002/01/13 22:36:56	1.2
+++ libgnomedb/gnome-db-browser-procedures.c	2002/01/28 21:42:20
@@ -21,6 +21,8 @@
  */
 
 #include <libgnomedb/gnome-db-browser.h>
+#include <libgnomedb/gnome-db-util.h>
+#include "gnome-db-browser-private.h"
 
 /*
  * Public functions
Index: libgnomedb/gnome-db-browser-types.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-browser-types.c,v
retrieving revision 1.3
diff -u -r1.3 gnome-db-browser-types.c
--- libgnomedb/gnome-db-browser-types.c	2002/01/20 22:11:03	1.3
+++ libgnomedb/gnome-db-browser-types.c	2002/01/28 21:42:20
@@ -21,6 +21,7 @@
  */
 
 #include <libgnomedb/gnome-db-browser.h>
+#include <libgnomedb/gnome-db-util.h>
 #include "gnome-db-browser-private.h"
 
 typedef struct {
Index: libgnomedb/gnome-db-control-widget.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-control-widget.c,v
retrieving revision 1.9
diff -u -r1.9 gnome-db-control-widget.c
--- libgnomedb/gnome-db-control-widget.c	2002/01/13 22:36:57	1.9
+++ libgnomedb/gnome-db-control-widget.c	2002/01/28 21:42:20
@@ -65,7 +65,6 @@
 static void
 gnome_db_control_widget_finalize (GObject *object)
 {
-	BonoboControlFrame* frame;
 	GnomeDbControlWidget *wid = (GnomeDbControlWidget *) object;
 
 	g_return_if_fail (GNOME_DB_IS_CONTROL_WIDGET (wid));
@@ -112,7 +111,8 @@
 				   const gchar *id,
 				   Bonobo_UIContainer uic)
 {
-	g_return_val_if_fail (GNOME_DB_IS_CONTROL_WIDGET (wid), wid);
+	g_return_val_if_fail (GNOME_DB_IS_CONTROL_WIDGET (wid),
+			      GTK_WIDGET (wid));
 
 	wid->priv->iid = g_strdup(id);
 
Index: libgnomedb/gnome-db-control.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-control.c,v
retrieving revision 1.5
diff -u -r1.5 gnome-db-control.c
--- libgnomedb/gnome-db-control.c	2002/01/16 00:26:36	1.5
+++ libgnomedb/gnome-db-control.c	2002/01/28 21:42:20
@@ -22,6 +22,7 @@
 
 #include <libgnomedb/gnome-db-control.h>
 #include <bonobo/bonobo-property-bag.h>
+#include <bonobo/bonobo-ui-util.h>
 
 #define PARENT_TYPE BONOBO_TYPE_CONTROL
 
@@ -273,7 +274,7 @@
                 bonobo_ui_util_set_ui (uic,
                                        control->priv->app_prefix,
                                        control->priv->ui_xml_file,
-                                       g_get_prgname);
+                                       g_get_prgname(), NULL);
                 bonobo_ui_component_thaw (uic, NULL);
         }
 }
Index: libgnomedb/gnome-db-dsn-config-druid.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-dsn-config-druid.c,v
retrieving revision 1.8
diff -u -r1.8 gnome-db-dsn-config-druid.c
--- libgnomedb/gnome-db-dsn-config-druid.c	2002/01/26 22:01:24	1.8
+++ libgnomedb/gnome-db-dsn-config-druid.c	2002/01/28 21:42:21
@@ -92,7 +92,6 @@
 add_to_string (gpointer key, gpointer value, gpointer user_data)
 {
 	const gchar *contents;
-	GtkWidget *entry;
 	GString **str = (GString **) user_data;
 
 
@@ -300,7 +299,8 @@
 		  "installation. Just follow the steps!"),
 		druid->priv->logo, NULL, NULL);
 	gtk_widget_show (druid->priv->start_page);
-	gnome_druid_append_page (GNOME_DRUID (druid), druid->priv->start_page);
+	gnome_druid_append_page (GNOME_DRUID (druid),
+				 GNOME_DRUID_PAGE (druid->priv->start_page));
 
 	g_signal_connect (G_OBJECT (druid->priv->start_page), "cancel", G_CALLBACK (druid_cancelled_cb), druid);
 
@@ -340,7 +340,8 @@
 		_("Username"), druid->priv->general_username, NULL);
 
 	gtk_widget_show (druid->priv->general_page);
-	gnome_druid_append_page (GNOME_DRUID (druid), druid->priv->general_page);
+	gnome_druid_append_page (GNOME_DRUID (druid),
+				 GNOME_DRUID_PAGE (druid->priv->general_page));
 
 	g_signal_connect (G_OBJECT (druid->priv->general_page), "cancel",
 			  G_CALLBACK (druid_cancelled_cb), druid);
@@ -366,7 +367,8 @@
 		druid->priv->provider_container, NULL);
 
 	gtk_widget_show (druid->priv->provider_page);
-	gnome_druid_append_page (GNOME_DRUID (druid), druid->priv->provider_page);
+	gnome_druid_append_page (GNOME_DRUID (druid),
+				 GNOME_DRUID_PAGE (druid->priv->provider_page));
 
 	g_signal_connect (G_OBJECT (druid->priv->provider_page), "cancel",
 			  G_CALLBACK (druid_cancelled_cb), druid);
@@ -380,7 +382,8 @@
 		  "just select it when asked for a data source"),
 		  druid->priv->logo, NULL, NULL);
 	gtk_widget_show (druid->priv->end_page);
-	gnome_druid_append_page (GNOME_DRUID (druid), druid->priv->end_page);
+	gnome_druid_append_page (GNOME_DRUID (druid),
+				 GNOME_DRUID_PAGE (druid->priv->end_page));
 
 	g_signal_connect (G_OBJECT (druid->priv->end_page), "cancel", G_CALLBACK (druid_cancelled_cb), druid);
 	g_signal_connect (G_OBJECT (druid->priv->end_page), "finish", G_CALLBACK (druid_finished_cb), druid);
Index: libgnomedb/gnome-db-error-dialog.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-error-dialog.c,v
retrieving revision 1.8
diff -u -r1.8 gnome-db-error-dialog.c
--- libgnomedb/gnome-db-error-dialog.c	2002/01/13 22:36:57	1.8
+++ libgnomedb/gnome-db-error-dialog.c	2002/01/28 21:42:21
@@ -225,7 +225,7 @@
 		gnome_db_error_next (GNOME_DB_ERROR (dialog->priv->error_widget));
 		break;
 	case GTK_RESPONSE_CLOSE :
-		gtk_widget_destroy (dialog);
+		gtk_widget_destroy (GTK_WIDGET (dialog));
 	}
 }
 
Index: libgnomedb/gnome-db-error.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-error.c,v
retrieving revision 1.5
diff -u -r1.5 gnome-db-error.c
--- libgnomedb/gnome-db-error.c	2002/01/13 22:36:57	1.5
+++ libgnomedb/gnome-db-error.c	2002/01/28 21:42:21
@@ -75,7 +75,7 @@
 		return;
 
 	error = GDA_ERROR (l->data);
-	tmp = g_strdup_printf ("%d", gda_error_get_number (error));
+	tmp = g_strdup_printf ("%ld", gda_error_get_number (error));
 	gtk_entry_set_text (GTK_ENTRY (error_widget->priv->error_number), tmp);
 	g_free (tmp);
 
Index: libgnomedb/gnome-db-gray-bar.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-gray-bar.c,v
retrieving revision 1.5
diff -u -r1.5 gnome-db-gray-bar.c
--- libgnomedb/gnome-db-gray-bar.c	2002/01/13 22:36:57	1.5
+++ libgnomedb/gnome-db-gray-bar.c	2002/01/28 21:42:21
@@ -22,6 +22,7 @@
 
 #include <gtk/gtklabel.h>
 #include <libgnomedb/gnome-db-gray-bar.h>
+#include <libgnomedb/gnome-db-util.h>
 
 #define PARENT_TYPE GTK_TYPE_EVENT_BOX
 
@@ -142,7 +143,7 @@
 
 	switch (param_id) {
 	case PROP_TEXT :
-		g_value_set_string (value, gtk_label_get_text (bar->priv->label));
+		g_value_set_string (value, gtk_label_get_text (GTK_LABEL (bar->priv->label)));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -196,7 +197,7 @@
 	bar = g_object_new (GNOME_DB_TYPE_GRAY_BAR, NULL);
 	gnome_db_gray_bar_set_text (bar, label);
 
-	return bar;
+	return GTK_WIDGET (bar);
 }
 
 /**
Index: libgnomedb/gnome-db-grid.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-grid.c,v
retrieving revision 1.15
diff -u -r1.15 gnome-db-grid.c
--- libgnomedb/gnome-db-grid.c	2002/01/26 23:56:39	1.15
+++ libgnomedb/gnome-db-grid.c	2002/01/28 21:42:21
@@ -22,6 +22,7 @@
 
 #include <libgnomedb/gnome-db-grid.h>
 #include <libgnomedb/gnome-db-util.h>
+#include <libgnomedb/gnome-db-model.h>
 #include <gobject/gmarshal.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtktreeview.h>
@@ -299,7 +300,7 @@
 
 	/* redisplay the GtkTreeView */
 	gtk_widget_destroy (grid->priv->tree_view);
-	grid->priv->tree_view = gnome_db_model_to_gtk_tree_view (grid->priv->model);
+	grid->priv->tree_view = GTK_WIDGET (gnome_db_model_to_gtk_tree_view (grid->priv->model));
 	gtk_container_add (GTK_CONTAINER (grid->priv->scroll), grid->priv->tree_view);
 	gtk_widget_show (grid->priv->tree_view);
 	setup_grid (grid);
Index: libgnomedb/gnome-db-init.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-init.c,v
retrieving revision 1.3
diff -u -r1.3 gnome-db-init.c
--- libgnomedb/gnome-db-init.c	2002/01/13 22:44:46	1.3
+++ libgnomedb/gnome-db-init.c	2002/01/28 21:42:22
@@ -21,9 +21,11 @@
  */
 
 #include <bonobo/bonobo-i18n.h>
-#include <libgda/libgda.h>
 #include <bonobo/bonobo-ui-main.h>
+#include <glade/glade-init.h>
+#include <libgda/libgda.h>
 #include <libgnomeui/gnome-ui-init.h>
+#include <libgnomedb/libgnomedb.h>
 
 void
 gnome_db_init (const gchar *app_id, const gchar *version, gint nargs, gchar *args[])
Index: libgnomedb/gnome-db-intl.h
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-intl.h,v
retrieving revision 1.2
diff -u -r1.2 gnome-db-intl.h
--- libgnomedb/gnome-db-intl.h	2002/01/13 22:36:57	1.2
+++ libgnomedb/gnome-db-intl.h	2002/01/28 21:42:22
@@ -33,7 +33,9 @@
 
 #ifdef ENABLE_NLS
 
-gchar *_gnome_db_gettext (const gchar *str);
+#include <glib.h>
+
+G_CONST_RETURN gchar *_gnome_db_gettext (const gchar *str);
 
 #include <libintl.h>
 #define _(String) _gnome_db_gettext (String)
Index: libgnomedb/gnome-db-list.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-list.c,v
retrieving revision 1.7
diff -u -r1.7 gnome-db-list.c
--- libgnomedb/gnome-db-list.c	2002/01/13 22:36:57	1.7
+++ libgnomedb/gnome-db-list.c	2002/01/28 21:42:22
@@ -293,13 +293,13 @@
 
 	row_count = gda_data_model_get_n_rows (model);
 	for (n = 0; n < row_count; n++) {
-		GdaValue *value;
+		const GdaValue *value;
 
 		value = gda_data_model_get_value_at (model, col, n);
 		if (value != NULL) {
 			gda_data_model_list_append_value (
 				GDA_DATA_MODEL_LIST (list->priv->data_model),
-				(const GdaValue *) value);
+				value);
 		}
 	}
 
Index: libgnomedb/gnome-db-login.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-login.c,v
retrieving revision 1.10
diff -u -r1.10 gnome-db-login.c
--- libgnomedb/gnome-db-login.c	2002/01/13 22:36:57	1.10
+++ libgnomedb/gnome-db-login.c	2002/01/28 21:42:22
@@ -226,7 +226,7 @@
 	if (dsn != NULL) {
 		login->priv->dsn_entry = gnome_db_new_entry_widget (0, FALSE);
 		gtk_entry_set_text (GTK_ENTRY (login->priv->dsn_entry), dsn);
-		gtk_editable_set_editable (GTK_ENTRY (login->priv->dsn_entry), FALSE);
+		gtk_editable_set_editable (GTK_EDITABLE (login->priv->dsn_entry), FALSE);
 	}
 	else {
 		login->priv->dsn_entry = gnome_db_new_combo_widget ();
Index: libgnomedb/gnome-db-util.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-util.c,v
retrieving revision 1.28
diff -u -r1.28 gnome-db-util.c
--- libgnomedb/gnome-db-util.c	2002/01/26 23:56:39	1.28
+++ libgnomedb/gnome-db-util.c	2002/01/28 21:42:22
@@ -27,11 +27,17 @@
 
 #include <libgnomedb/gnome-db-browser.h>
 #include <libgnomedb/gnome-db-grid.h>
+#include <libgnomedb/gnome-db-intl.h>
 #include <libgnomedb/gnome-db-util.h>
 #include <glib-object.h>
 #include <gtk/gtkbutton.h>
+#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtkcombo.h>
+#include <gtk/gtkframe.h>
+#include <gtk/gtkhbbox.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkhpaned.h>
+#include <gtk/gtkhseparator.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenuitem.h>
@@ -39,6 +45,8 @@
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtknotebook.h>
 #include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtkstatusbar.h>
+#include <gtk/gtktable.h>
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkvbox.h>
@@ -81,7 +89,7 @@
 GtkWidget *
 gnome_db_new_button_widget_from_stock (const gchar *stock_id)
 {
-	GtkButton *button;
+	GtkWidget *button;
 
 	button = gtk_button_new_from_stock (stock_id);
 	gtk_widget_show (button);
Index: libgnomedb/gnome-db-window.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/libgnomedb/gnome-db-window.c,v
retrieving revision 1.6
diff -u -r1.6 gnome-db-window.c
--- libgnomedb/gnome-db-window.c	2002/01/14 02:53:59	1.6
+++ libgnomedb/gnome-db-window.c	2002/01/28 21:42:22
@@ -24,6 +24,7 @@
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-ui-container.h>
+#include <bonobo/bonobo-ui-util.h>
 #include <libgnomedb/gnome-db-util.h>
 #include <libgnomedb/gnome-db-window.h>
 
@@ -238,7 +239,7 @@
 			  G_CALLBACK (window_destroyed_cb), NULL);
 
 	ui_container = bonobo_ui_container_new ();
-	window = bonobo_window_construct (BONOBO_WINDOW (window), ui_container, name, name);
+	window = GNOME_DB_WINDOW (bonobo_window_construct (BONOBO_WINDOW (window), ui_container, name, name));
 
 	corba_container = BONOBO_OBJREF (ui_container);
 	window->priv->ui_component = bonobo_ui_component_new (name);
@@ -248,7 +249,7 @@
 	if (verbs != NULL && ui_xml_file != NULL) {
 		bonobo_ui_component_freeze (window->priv->ui_component, NULL);
 		bonobo_ui_util_set_ui (window->priv->ui_component,
-				       app_prefix, ui_xml_file, name);
+				       app_prefix, ui_xml_file, name, NULL);
 		bonobo_ui_component_add_verb_list_with_data (window->priv->ui_component,
 							     verbs, data);
 		bonobo_ui_component_thaw (window->priv->ui_component, NULL);
Index: testing/test-grid.c
===================================================================
RCS file: /cvs/gnome/libgnomedb/testing/test-grid.c,v
retrieving revision 1.3
diff -u -r1.3 test-grid.c
--- testing/test-grid.c	2002/01/13 22:37:38	1.3
+++ testing/test-grid.c	2002/01/28 21:42:23
@@ -36,7 +36,7 @@
 create_data_model (void)
 {
 	gint i;
-	GdaDataModelArray *model;
+	GdaDataModel *model;
 
 	model = gda_data_model_array_new (6);
 
@@ -50,9 +50,9 @@
 		values = g_list_append (values, gda_value_new_string ("Another string"));
 		values = g_list_append (values, gda_value_new_double (4560.45672113323093));
 
-		gda_data_model_array_append_row (model, values);
+		gda_data_model_array_append_row (GDA_DATA_MODEL_ARRAY (model), values);
 
-		g_list_foreach (values, gda_value_free, NULL);
+		g_list_foreach (values, (GFunc) gda_value_free, NULL);
 		g_list_free (values);
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]