[libgda] Fix some more compiler warnings



commit 2d5e39aad3dd847ec250a6235ed135e3869a6af4
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jul 5 09:33:25 2011 +0200

    Fix some more compiler warnings

 control-center/gdaui-dsn-assistant.c          |    3 +++
 libgda-ui/gdaui-data-filter.c                 |    2 +-
 libgda-ui/gdaui-raw-grid.c                    |    1 +
 testing/virtual-test.c                        |    2 +-
 tools/browser/ldap-browser/ldap-search-page.c |    2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/control-center/gdaui-dsn-assistant.c b/control-center/gdaui-dsn-assistant.c
index 4f4eb6a..7659809 100644
--- a/control-center/gdaui-dsn-assistant.c
+++ b/control-center/gdaui-dsn-assistant.c
@@ -431,7 +431,10 @@ gdaui_dsn_assistant_init (GdauiDsnAssistant *assistant,
 	gtk_widget_show (label);
 	gtk_assistant_append_page (assist, label);
 	gtk_assistant_set_page_title (assist, label, _("Add a new data source..."));
+	
+	/* TODO: This is deprecated. Add it to the main content instead: */
 	gtk_assistant_set_page_header_image (assist, label, assistant->priv->logo);
+	
 	gtk_assistant_set_page_type (assist, label, GTK_ASSISTANT_PAGE_INTRO);
 	gtk_assistant_set_page_complete (assist, label, TRUE);
 
diff --git a/libgda-ui/gdaui-data-filter.c b/libgda-ui/gdaui-data-filter.c
index 484f6b1..8ddaf7b 100644
--- a/libgda-ui/gdaui-data-filter.c
+++ b/libgda-ui/gdaui-data-filter.c
@@ -118,7 +118,7 @@ set_wait_cursor (GtkWidget *w)
 		GdkCursor* cursor;
 		cursor = gdk_cursor_new (GDK_WATCH);
 		gdk_window_set_cursor (gtk_widget_get_window (parent), cursor);
-		gdk_cursor_unref (cursor);
+		g_object_unref (cursor);
 	}
 }
 
diff --git a/libgda-ui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
index 134dd51..8b3dc14 100644
--- a/libgda-ui/gdaui-raw-grid.c
+++ b/libgda-ui/gdaui-raw-grid.c
@@ -30,6 +30,7 @@
 #include "data-entries/gdaui-data-cell-renderer-combo.h"
 #include "data-entries/gdaui-data-cell-renderer-info.h"
 #include <libgda/binreloc/gda-binreloc.h>
+#include <gtk.h>
 
 static void gdaui_raw_grid_class_init (GdauiRawGridClass *klass);
 static void gdaui_raw_grid_init (GdauiRawGrid *wid);
diff --git a/testing/virtual-test.c b/testing/virtual-test.c
index e64a95b..445c578 100644
--- a/testing/virtual-test.c
+++ b/testing/virtual-test.c
@@ -31,7 +31,7 @@ main (int argc, char **argv)
 	GError *error = NULL;	
 	GdaConnection *cnc;
 	GdaVirtualProvider *provider;
-	GdaDataModel *xml_model, *csv_model, *rw_model;
+	GdaDataModel *xml_model, /* *csv_model, */ *rw_model;
 	GdaDataModel *proxy = NULL;
 	
 	gda_init ();
diff --git a/tools/browser/ldap-browser/ldap-search-page.c b/tools/browser/ldap-browser/ldap-search-page.c
index 8e12477..5728816 100644
--- a/tools/browser/ldap-browser/ldap-search-page.c
+++ b/tools/browser/ldap-browser/ldap-search-page.c
@@ -536,7 +536,7 @@ ldap_search_page_page_get_tab_label (BrowserPage *page, GtkWidget **out_close_bu
 	GdkPixbuf *search_pixbuf;
 
 	epage = LDAP_SEARCH_PAGE (page);
-	search_pixbuf = gtk_widget_render_icon (GTK_WIDGET (page), GTK_STOCK_FIND, GTK_ICON_SIZE_MENU, NULL);
+	search_pixbuf = gtk_widget_render_icon_pixbuf (GTK_WIDGET (page), GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
 	tab_name = _("LDAP search");
 	return browser_make_tab_label_with_pixbuf (tab_name,
 						   search_pixbuf,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]