GNOME.org
 

[libgda] Fixed compilation warnings and avoid using deprecated functions/objects

commit d07c5514393c23c0e01342339f49cbb07f4733a4
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Aug 20 21:52:41 2012 +0200

    Fixed compilation warnings and avoid using deprecated functions/objects

 libgda-ui/data-entries/plugins/common-pict.c     |    4 +-
 libgda-ui/demos/ddl_queries.c                    |   24 +++---
 libgda-ui/demos/grid_model_change.c              |    1 -
 libgda-ui/demos/login.c                          |   20 +++---
 libgda-ui/gdaui-cloud.c                          |    1 +
 libgda-ui/gdaui-data-filter.c                    |   20 ++---
 libgda-ui/gdaui-data-proxy-info.c                |   17 ++--
 libgda-ui/gdaui-login.c                          |   28 +++----
 libgda-ui/gdaui-raw-grid.c                       |   40 +++++-----
 libgda-ui/gdaui-rt-editor.c                      |    9 +-
 libgda-ui/gdaui-server-operation.c               |   94 +++++++++-------------
 libgda-ui/gdaui-set.c                            |    2 +-
 libgda-ui/internal/popup-container.c             |    2 -
 tools/browser/common/widget-overlay.c            |   13 ++--
 tools/browser/query-exec/query-console-page.c    |    5 +-
 tools/browser/query-exec/query-editor.c          |   15 ++--
 tools/browser/schema-browser/relations-diagram.c |   20 +++---
 tools/browser/schema-browser/table-columns.c     |   12 ++-
 18 files changed, 155 insertions(+), 172 deletions(-)
---
diff --git a/libgda-ui/data-entries/plugins/common-pict.c b/libgda-ui/data-entries/plugins/common-pict.c
index bfcdbba..21229dc 100644
--- a/libgda-ui/data-entries/plugins/common-pict.c
+++ b/libgda-ui/data-entries/plugins/common-pict.c
@@ -639,7 +639,7 @@ common_pict_add_cached_pixbuf (PictOptions *options, const GValue *value, GdkPix
 	else if (GDA_VALUE_HOLDS_BINARY (value)) {
 		const GdaBinary *bin;
 		bin = gda_value_get_binary (value);
-		hash = g_new (guint, 1);
+		hash = g_new (gint, 1);
 		*hash = compute_hash (bin->data, bin->binary_length);
 		g_hash_table_insert (options->pixbuf_hash, hash, g_object_ref (pixbuf));
 	}
@@ -651,7 +651,7 @@ common_pict_add_cached_pixbuf (PictOptions *options, const GValue *value, GdkPix
 		if (bin) {
 			if (!bin->data && blob->op)
 				gda_blob_op_read_all (blob->op, (GdaBlob*) blob);
-			hash = g_new (guint, 1);
+			hash = g_new (gint, 1);
 			*hash = compute_hash (bin->data, bin->binary_length);
 			g_hash_table_insert (options->pixbuf_hash, hash, g_object_ref (pixbuf));
 		}
diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
index 3d70413..6b4d7dd 100644
--- a/libgda-ui/demos/ddl_queries.c
+++ b/libgda-ui/demos/ddl_queries.c
@@ -51,7 +51,7 @@ GtkWidget *
 do_ddl_queries (GtkWidget *do_widget)
 {  
 	if (!window) {
-		GtkWidget *table;
+		GtkWidget *grid;
 		GtkWidget *label;
 		GtkWidget *wid;
 		DemoData *data;
@@ -73,25 +73,25 @@ do_ddl_queries (GtkWidget *do_widget)
 		g_signal_connect (window, "destroy",
 				  G_CALLBACK (gtk_widget_destroyed), &window);
 		
-		table = gtk_table_new (3, 2, FALSE);
+		grid = gtk_grid_new ();
 		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
-				    table, TRUE, TRUE, 0);
-		gtk_container_set_border_width (GTK_CONTAINER (table), 5);
+				    grid, TRUE, TRUE, 0);
+		gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
 		
 		label = gtk_label_new ("<b>Tested provider and operation:</b>");
 		gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 		gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-		gtk_table_attach (GTK_TABLE (table), label, 0, 2, 0, 1, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 2, 1);
 		
 		/* provider selection */
 		label = gtk_label_new ("Tested provider:");
 		gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
 
 		wid = gdaui_provider_selector_new ();
 		gdaui_provider_selector_set_provider (GDAUI_PROVIDER_SELECTOR (wid),
 								  "SQLite");
-		gtk_table_attach (GTK_TABLE (table), wid, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), wid, 1, 1, 1, 1);
 		data->prov_sel = GDAUI_PROVIDER_SELECTOR (wid);
 		g_signal_connect (G_OBJECT (data->prov_sel), "changed", 
 				  G_CALLBACK (tested_provider_changed_cb), data);
@@ -99,10 +99,10 @@ do_ddl_queries (GtkWidget *do_widget)
 		/* operation selection */
 		label = gtk_label_new ("Tested operation:");
 		gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-		gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
 		
 		wid = gdaui_combo_new ();
-		gtk_table_attach (GTK_TABLE (table), wid, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), wid, 1, 2, 1, 1);
 		g_signal_connect (G_OBJECT (wid), "changed",
 				  G_CALLBACK (tested_operation_changed_cb), data);
 		data->op_combo = wid;
@@ -111,13 +111,13 @@ do_ddl_queries (GtkWidget *do_widget)
 		label = gtk_label_new ("<b>GdauiServerOperation widget:</b>");
 		gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
 		gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-		gtk_table_attach (GTK_TABLE (table), label, 0, 2, 3, 4, GTK_FILL, 0, 0, 5);
+		gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 2, 1);
 
 		sw = gtk_scrolled_window_new (FALSE, 0);
 		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
 						GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 		gtk_widget_set_size_request (sw, 600, 450);
-		gtk_table_attach_defaults (GTK_TABLE (table), sw, 0, 2, 4, 5);
+		gtk_grid_attach (GTK_GRID (grid), sw, 0, 4, 2, 1);
 		vp = gtk_viewport_new (NULL, NULL);
 		gtk_viewport_set_shadow_type (GTK_VIEWPORT (vp), GTK_SHADOW_NONE);
 		gtk_container_add (GTK_CONTAINER (sw), vp);
@@ -125,7 +125,7 @@ do_ddl_queries (GtkWidget *do_widget)
 		
 		/* bottom buttons */
 		bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-		gtk_table_attach (GTK_TABLE (table), bbox, 0, 2, 5, 6, 0, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), bbox, 0, 5, 2, 1);
 
 		wid = gtk_button_new_with_label ("Show named parameters");
 		data->show_button = wid;
diff --git a/libgda-ui/demos/grid_model_change.c b/libgda-ui/demos/grid_model_change.c
index ba867fb..db1ed16 100644
--- a/libgda-ui/demos/grid_model_change.c
+++ b/libgda-ui/demos/grid_model_change.c
@@ -32,7 +32,6 @@ do_grid_model_change (GtkWidget *do_widget)
 		GtkWidget *vbox;
 		GtkWidget *label;
 		GdaDataModel *models [3];
-		GtkWidget *sw;
 		
 		window = gtk_dialog_new_with_buttons ("Changing data in a GdauiRawGrid",
 						      GTK_WINDOW (do_widget),
diff --git a/libgda-ui/demos/login.c b/libgda-ui/demos/login.c
index 5499274..1efa4e6 100644
--- a/libgda-ui/demos/login.c
+++ b/libgda-ui/demos/login.c
@@ -61,7 +61,7 @@ GtkWidget *
 do_login (GtkWidget *do_widget)
 {  
 	if (!window) {
-		GtkWidget *table, *cb, *button;
+		GtkWidget *grid, *cb, *button;
 		GtkWidget *login, *frame;
 
 		window = gtk_dialog_new_with_buttons ("GdauiLogin widget",
@@ -77,14 +77,14 @@ do_login (GtkWidget *do_widget)
 				  G_CALLBACK (gtk_widget_destroyed), &window);
 		
 
-		table = gtk_table_new (3, 2, FALSE);
+		grid = gtk_grid_new ();
 		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
-				    table, TRUE, TRUE, 0);
-		gtk_container_set_border_width (GTK_CONTAINER (table), 5);
+				    grid, TRUE, TRUE, 0);
+		gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
 
 		/* Create the login widget */
 		frame = gtk_frame_new ("Login widget:");
-		gtk_table_attach_defaults (GTK_TABLE (table), frame, 0, 2, 3, 4);
+		gtk_grid_attach (GTK_GRID (grid), frame, 0, 3, 2, 1);
 
 		login = gdaui_login_new (NULL);
 		gtk_container_add (GTK_CONTAINER (frame), login);
@@ -92,31 +92,31 @@ do_login (GtkWidget *do_widget)
 		/* Create the options */
 		cb = gtk_check_button_new_with_label ("Enable control center");
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), TRUE);
-		gtk_table_attach (GTK_TABLE (table), cb, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), cb, 0, 0, 1, 1);
 		g_signal_connect (cb, "toggled",
 				  G_CALLBACK (cb1_toggled_cb), login);
 		
 		cb = gtk_check_button_new_with_label ("Hide DSN selection");
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), FALSE);
-		gtk_table_attach (GTK_TABLE (table), cb, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), cb, 0, 1, 1, 1);
 		g_signal_connect (cb, "toggled",
 				  G_CALLBACK (cb2_toggled_cb), login);
 
 		cb = gtk_check_button_new_with_label ("Hide direct connection");
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb), FALSE);
-		gtk_table_attach (GTK_TABLE (table), cb, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), cb, 0, 2, 1, 1);
 		g_signal_connect (cb, "toggled",
 				  G_CALLBACK (cb3_toggled_cb), login);
 		
 		button = gtk_button_new_with_label ("Show connection's parameters");
-		gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), button, 1, 0, 1, 1);
 		g_signal_connect (button, "clicked",
 				  G_CALLBACK (button_clicked_cb), login);
 
 		GtkWidget *status;
 		gboolean valid;
 		status = gtk_label_new ("...");
-		gtk_table_attach (GTK_TABLE (table), status, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+		gtk_grid_attach (GTK_GRID (grid), status, 1, 2, 1, 1);
 		g_object_get (G_OBJECT (login), "valid", &valid, NULL);
 		login_changed_cb (GDAUI_LOGIN (login), valid, GTK_LABEL (status));
 		g_signal_connect (login, "changed",
diff --git a/libgda-ui/gdaui-cloud.c b/libgda-ui/gdaui-cloud.c
index 6e09a24..db54b9e 100644
--- a/libgda-ui/gdaui-cloud.c
+++ b/libgda-ui/gdaui-cloud.c
@@ -879,6 +879,7 @@ key_press_event (GtkWidget *text_view, GdkEventKey *event, GdauiCloud *cloud)
 					mvt_type = GTK_MOVEMENT_VISUAL_POSITIONS;
 					mvt_amount = -1;
 					break;
+				default:
 				case GDK_KEY_Right:
 					done = ! gtk_text_iter_forward_char (&iter);
 					mvt_type = GTK_MOVEMENT_VISUAL_POSITIONS;
diff --git a/libgda-ui/gdaui-data-filter.c b/libgda-ui/gdaui-data-filter.c
index 77c8a80..20251b8 100644
--- a/libgda-ui/gdaui-data-filter.c
+++ b/libgda-ui/gdaui-data-filter.c
@@ -52,7 +52,7 @@ static void apply_filter_cb (GtkButton *button, GdauiDataFilter *filter);
 
 struct _GdauiDataFilterPriv
 {
-	GdauiDataProxy   *data_widget;
+	GdauiDataProxy    *data_widget;
 	GdaDataProxy      *proxy;
 
 	GtkWidget         *filter_entry;
@@ -194,7 +194,7 @@ clear_filter_cb (GtkButton *button, GdauiDataFilter *filter)
 static void
 gdaui_data_filter_init (GdauiDataFilter * wid)
 {
-	GtkWidget *table, *label, *entry, *button, *bbox;
+	GtkWidget *grid, *label, *entry, *button, *bbox;
 	gchar *str;
 
 	wid->priv = g_new0 (GdauiDataFilterPriv, 1);
@@ -203,10 +203,8 @@ gdaui_data_filter_init (GdauiDataFilter * wid)
 
 	gtk_orientable_set_orientation (GTK_ORIENTABLE (wid), GTK_ORIENTATION_VERTICAL);
 
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_table_set_row_spacing (GTK_TABLE (table), 1, 10);
-	gtk_table_set_col_spacing (GTK_TABLE (table), 0, 5);
-	gtk_box_pack_start (GTK_BOX (wid), table, TRUE, TRUE, 0);
+	grid = gtk_grid_new ();
+	gtk_box_pack_start (GTK_BOX (wid), grid, TRUE, TRUE, 0);
 
 	label = gtk_label_new ("");
 	str = g_strdup_printf ("<b>%s</b>\n(<small>%s</small>):", _("Filter"), _("any valid SQL expression"));
@@ -218,18 +216,18 @@ gdaui_data_filter_init (GdauiDataFilter * wid)
 						"expression can be: <b><tt>_2 like 'doe%'</tt></b> "
 						"to filter rows where the 2nd column starts with <tt>doe</tt>."));
 
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
 	entry = gtk_entry_new ();
-	gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1);
+	gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
 	g_signal_connect (G_OBJECT (entry), "activate",
 			  G_CALLBACK (apply_filter_cb), wid);
 
 	label = gtk_label_new ("");
 	wid->priv->notice = label;
-	gtk_table_attach (GTK_TABLE (table), label, 0, 2, 1, 2, GTK_FILL, 0, GTK_SHRINK, 5);
+	gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 2, 1);
 
 	bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-	gtk_table_attach (GTK_TABLE (table), bbox, 0, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, GTK_SHRINK, 5);
+	gtk_grid_attach (GTK_GRID (grid), bbox, 0, 2, 2, 1);
 	button = gtk_button_new_with_label (_("Set filter"));
 	gtk_container_add (GTK_CONTAINER (bbox), button);
 	g_signal_connect (G_OBJECT (button), "clicked",
@@ -240,7 +238,7 @@ gdaui_data_filter_init (GdauiDataFilter * wid)
 	g_signal_connect (G_OBJECT (button), "clicked",
 			  G_CALLBACK (clear_filter_cb), wid);
 
-	gtk_widget_show_all (table);
+	gtk_widget_show_all (grid);
 	gtk_widget_hide (wid->priv->notice);
 
 	wid->priv->filter_entry = entry;
diff --git a/libgda-ui/gdaui-data-proxy-info.c b/libgda-ui/gdaui-data-proxy-info.c
index d3fd580..7e8c117 100644
--- a/libgda-ui/gdaui-data-proxy-info.c
+++ b/libgda-ui/gdaui-data-proxy-info.c
@@ -486,8 +486,6 @@ modif_buttons_make (GdauiDataProxyInfo *info)
 		gtk_widget_unparent (info->priv->tool_item);
 	}
 
-	gboolean ensure_update = FALSE;
-
 	if (info->priv->uimanager) {
 		if (info->priv->merge_id_row_modif) {
 			gtk_ui_manager_remove_ui (info->priv->uimanager, info->priv->merge_id_row_modif);
@@ -629,13 +627,16 @@ modif_buttons_make (GdauiDataProxyInfo *info)
 static void
 row_spin_changed_cb (GtkSpinButton *spin, GdauiDataProxyInfo *info)
 {
-	gint row;
+	gint row, nrows;
 	gint value = gtk_spin_button_get_value (spin);
+	nrows = gda_data_model_get_n_rows (GDA_DATA_MODEL (info->priv->proxy));
 
-	if ((value >= 1) &&
-	    (value <= gda_data_model_get_n_rows (GDA_DATA_MODEL (info->priv->proxy))))
+	if ((value >= 1) && (value <= nrows))
 		row = value - 1;
-
+	else if (value > nrows)
+		row = nrows - 1;
+	else
+		row = 0;
 	gda_data_model_iter_move_to_row (gdaui_data_selector_get_data_set (GDAUI_DATA_SELECTOR (info->priv->data_proxy)),
 					 row);
 }
@@ -660,7 +661,6 @@ idle_modif_buttons_update (GdauiDataProxyInfo *info)
 {
 	GdaDataModelIter *model_iter;
 	gboolean wrows, filtered_proxy = FALSE;
-	gint has_selection;
 	gint row;
 
 	gint proxy_rows = 0;
@@ -763,11 +763,12 @@ idle_modif_buttons_update (GdauiDataProxyInfo *info)
 		gboolean is_inserted = FALSE;
 		gboolean force_del_btn = FALSE;
 		gboolean force_undel_btn = FALSE;
+		gboolean has_selection;
 
+		has_selection = (row >= 0) ? TRUE : FALSE;
 		if (info->priv->proxy) {
 			changed = gda_data_proxy_has_changed (info->priv->proxy);
 
-			has_selection = (row >= 0) ? TRUE : FALSE;
 			if (has_selection) {
 				to_be_deleted = gda_data_proxy_row_is_deleted (info->priv->proxy, row);
 				is_inserted = gda_data_proxy_row_is_inserted (info->priv->proxy, row);
diff --git a/libgda-ui/gdaui-login.c b/libgda-ui/gdaui-login.c
index 7bdcb79..2123e6d 100644
--- a/libgda-ui/gdaui-login.c
+++ b/libgda-ui/gdaui-login.c
@@ -148,7 +148,7 @@ auth_data_changed_cb (GdauiProviderAuthEditor *auth, GdauiLogin *login)
 static void
 gdaui_login_init (GdauiLogin *login, G_GNUC_UNUSED GdauiLoginClass *klass)
 {
-	GtkWidget *table;
+	GtkWidget *grid;
 	GtkWidget *wid;
 	
 	/* allocate the internal structure */
@@ -167,31 +167,30 @@ gdaui_login_init (GdauiLogin *login, G_GNUC_UNUSED GdauiLoginClass *klass)
 	g_object_unref (conf);
 
 	/* table layout */
-	table = gtk_table_new (3, 3, FALSE);
-	gtk_widget_show (table);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-	gtk_box_pack_start (GTK_BOX (login), table, TRUE, TRUE, 0);
+	grid = gtk_grid_new ();
+	gtk_widget_show (grid);
+	gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
+	gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
+	gtk_box_pack_start (GTK_BOX (login), grid, TRUE, TRUE, 0);
 	
 	/* radio buttons */
 	wid = gtk_radio_button_new_with_label (NULL, _("Use data source:"));
 	g_signal_connect (wid, "toggled",
 			  G_CALLBACK (radio_button_use_dsn_toggled_cb), login);
-	gtk_table_attach (GTK_TABLE (table), wid, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), wid, 0, 0, 1, 1);
 	gtk_widget_show (wid);
 	login->priv->rb_dsn = wid;
 
 	wid = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (wid),
 							   _("Specify connection:"));
-	gtk_table_attach (GTK_TABLE (table), wid, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), wid, 0, 1, 1, 1);
 	gtk_widget_show (wid);
 	login->priv->rb_prov = wid;
 
 	/* widget to specify a DSN to use */
 	login->priv->dsn_selector = _gdaui_dsn_selector_new ();
 	gtk_widget_show (login->priv->dsn_selector); /* Show the DSN selector */
-	gtk_table_attach (GTK_TABLE (table), login->priv->dsn_selector, 1, 2, 0, 1,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), login->priv->dsn_selector, 1, 0, 1, 1);
 	g_signal_connect (G_OBJECT (login->priv->dsn_selector), "changed",
 			  G_CALLBACK (dsn_entry_changed_cb), login);
 			  
@@ -202,19 +201,18 @@ gdaui_login_init (GdauiLogin *login, G_GNUC_UNUSED GdauiLoginClass *klass)
 	g_signal_connect (G_OBJECT (login->priv->cc_button), "clicked",
 			  G_CALLBACK (run_cc_cb), login);
 	gtk_widget_show (login->priv->cc_button);
-	gtk_table_attach (GTK_TABLE (table), login->priv->cc_button, 2, 3, 0, 1,
-			  GTK_FILL, GTK_FILL, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), login->priv->cc_button, 2, 0, 1, 1);
 		
 	/* widget to specify a direct connection */
 	login->priv->prov_selector = gdaui_provider_selector_new ();
-	gtk_table_attach (GTK_TABLE (table),login->priv->prov_selector, 1, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid),login->priv->prov_selector, 1, 1, 2, 1);
 	gtk_widget_show (login->priv->prov_selector);
 	gtk_widget_set_sensitive (login->priv->prov_selector, FALSE);
 	g_signal_connect (login->priv->prov_selector, "changed",
 			  G_CALLBACK (prov_entry_changed_cb), login);
 
 	login->priv->cnc_params_editor = _gdaui_provider_spec_editor_new (NULL);
-	gtk_table_attach (GTK_TABLE (table),login->priv->cnc_params_editor, 1, 3, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), login->priv->cnc_params_editor, 1, 2, 2, 1);
 	gtk_widget_show (login->priv->cnc_params_editor);
 	gtk_widget_set_sensitive (login->priv->cnc_params_editor, FALSE);
 	g_signal_connect (login->priv->cnc_params_editor, "changed",
@@ -222,7 +220,7 @@ gdaui_login_init (GdauiLogin *login, G_GNUC_UNUSED GdauiLoginClass *klass)
 	  
 	/* Create the authentication part */
 	login->priv->auth_widget = _gdaui_provider_auth_editor_new (NULL);
-	gtk_table_attach_defaults (GTK_TABLE (table), login->priv->auth_widget, 1, 3, 3, 4);
+	gtk_grid_attach (GTK_GRID (grid), login->priv->auth_widget, 1, 3, 2, 1);
 	gtk_widget_show (login->priv->auth_widget);
 	g_signal_connect (login->priv->auth_widget, "changed",
 			  G_CALLBACK (auth_data_changed_cb), login);
diff --git a/libgda-ui/gdaui-raw-grid.c b/libgda-ui/gdaui-raw-grid.c
index 5f8a3ff..2792c26 100644
--- a/libgda-ui/gdaui-raw-grid.c
+++ b/libgda-ui/gdaui-raw-grid.c
@@ -2127,7 +2127,7 @@ menu_save_as_cb (G_GNUC_UNUSED GtkWidget *widget, GdauiRawGrid *grid)
 	GtkWidget *label;
 	GtkWidget *filename;
 	GtkWidget *types, *scope;
-	GtkWidget *hbox, *table, *check, *dbox;
+	GtkWidget *hbox, *grid1, *check, *dbox;
 	char *str;
 	GtkTreeSelection *sel;
 	gint selrows;
@@ -2187,20 +2187,20 @@ menu_save_as_cb (G_GNUC_UNUSED GtkWidget *widget, GdauiRawGrid *grid)
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
 
-	table = gtk_table_new (3, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-	gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
-	gtk_widget_show (table);
+	grid1 = gtk_grid_new ();
+	gtk_grid_set_row_spacing (GTK_GRID (grid1), 5);
+	gtk_grid_set_column_spacing (GTK_GRID (grid1), 5);
+	gtk_box_pack_start (GTK_BOX (hbox), grid1, TRUE, TRUE, 0);
+	gtk_widget_show (grid1);
 
 	/* file type */
 	label = gtk_label_new (_("File type:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid1), label, 0, 0, 1, 1);
 	gtk_widget_show (label);
 
 	types = gtk_combo_box_text_new ();
-	gtk_table_attach_defaults (GTK_TABLE (table), types, 1, 2, 0, 1);
+	gtk_grid_attach (GTK_GRID (grid1), types, 1, 0, 1, 1);
 	gtk_widget_show (types);
 	g_object_set_data (G_OBJECT (dialog), "types", types);
 
@@ -2215,7 +2215,7 @@ menu_save_as_cb (G_GNUC_UNUSED GtkWidget *widget, GdauiRawGrid *grid)
 	/* data scope */
 	label = gtk_label_new (_("Data to save:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid1), label, 0, 1, 1, 1);
 	gtk_widget_show (label);
 
 	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (grid));
@@ -2224,7 +2224,7 @@ menu_save_as_cb (G_GNUC_UNUSED GtkWidget *widget, GdauiRawGrid *grid)
 		gtk_widget_set_sensitive (label, FALSE);
 
 	scope = gtk_combo_box_text_new ();
-	gtk_table_attach_defaults (GTK_TABLE (table), scope, 1, 2, 1, 2);
+	gtk_grid_attach (GTK_GRID (grid1), scope, 1, 1, 1, 1);
 	gtk_widget_show (scope);
 	g_object_set_data (G_OBJECT (dialog), "scope", scope);
 
@@ -2237,39 +2237,39 @@ menu_save_as_cb (G_GNUC_UNUSED GtkWidget *widget, GdauiRawGrid *grid)
 	/* other options */
 	GtkWidget *exp;
 	exp = gtk_expander_new (_("Other options"));
-	gtk_table_attach_defaults (GTK_TABLE (table), exp, 0, 2, 2, 3);
+	gtk_grid_attach (GTK_GRID (grid1), exp, 0, 2, 2, 1);
 
-	GtkWidget *table2;
-	table2 = gtk_table_new (2, 4, FALSE);
-	gtk_container_add (GTK_CONTAINER (exp), table2);
+	GtkWidget *grid2;
+	grid2 = gtk_grid_new ();
+	gtk_container_add (GTK_CONTAINER (exp), grid2);
 	
 	label = gtk_label_new (_("Empty string when NULL?"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-	gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid2), label, 0, 0, 1, 1);
 	gtk_widget_set_tooltip_text (label, _("Export NULL values as an empty \"\" string"));
 
 	check = gtk_check_button_new ();
-	gtk_table_attach_defaults (GTK_TABLE (table2), check, 1, 2, 0, 1);
+	gtk_grid_attach (GTK_GRID (grid2), check, 1, 0, 1, 1);
 	g_object_set_data (G_OBJECT (dialog), "null_as_empty", check);
 	gtk_widget_set_tooltip_text (check, _("Export NULL values as an empty \"\" string"));
 
 	label = gtk_label_new (_("Invalid data as NULL?"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-	gtk_table_attach (GTK_TABLE (table2), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid2), label, 2, 0, 1, 1);
 	gtk_widget_set_tooltip_text (label, _("Don't export invalid data,\nbut export a NULL value instead"));
 
 	check = gtk_check_button_new ();
-	gtk_table_attach_defaults (GTK_TABLE (table2), check, 3, 4, 0, 1);
+	gtk_grid_attach (GTK_GRID (grid2), check, 3, 0, 1, 1);
 	g_object_set_data (G_OBJECT (dialog), "invalid_as_null", check);
 	gtk_widget_set_tooltip_text (check, _("Don't export invalid data,\nbut export a NULL value instead"));
 
 	label = gtk_label_new (_("Field names on first row?"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
-	gtk_table_attach (GTK_TABLE (table2), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid2), label, 0, 1, 1, 1);
 	gtk_widget_set_tooltip_text (label, _("Add a row at beginning with columns names"));
 
 	check = gtk_check_button_new ();
-	gtk_table_attach_defaults (GTK_TABLE (table2), check, 1, 2, 1, 2);
+	gtk_grid_attach (GTK_GRID (grid2), check, 1, 1, 1, 1);
 	g_object_set_data (G_OBJECT (dialog), "first_row", check);
 	gtk_widget_set_tooltip_text (check, _("Add a row at beginning with columns names"));
 
diff --git a/libgda-ui/gdaui-rt-editor.c b/libgda-ui/gdaui-rt-editor.c
index 3001de5..1d11548 100644
--- a/libgda-ui/gdaui-rt-editor.c
+++ b/libgda-ui/gdaui-rt-editor.c
@@ -281,12 +281,13 @@ gdaui_rt_editor_class_init (GdauiRtEditorClass *klass)
 static void
 text_view_realized_cb (GtkWidget *tv, GdauiRtEditor *rte)
 {
-	GdkWindow *win;
-	GtkStyle *style;
 	if (rte->priv->no_background && ! gtk_text_view_get_editable (GTK_TEXT_VIEW (tv))) {
+		GdkWindow *win;
+		GtkStyleContext* style_context = gtk_widget_get_style_context (tv);
+                GdkRGBA color;
 		win = gtk_text_view_get_window (GTK_TEXT_VIEW (tv), GTK_TEXT_WINDOW_TEXT);
-		style = gtk_widget_get_style (tv);
-		gdk_window_set_background (win, &(style->bg [GTK_STATE_NORMAL]));
+                gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_NORMAL, &color);
+		gdk_window_set_background_rgba (win, &color);
 	}
 }
 
diff --git a/libgda-ui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
index db1fd59..70fd3eb 100644
--- a/libgda-ui/gdaui-server-operation.c
+++ b/libgda-ui/gdaui-server-operation.c
@@ -365,8 +365,8 @@ static void seq_del_item (GtkButton *button, GdauiServerOperation *form);
  * @path is like "/SEQ", DOES NOT contain the index of the item to add, which is also in @index
  */
 static void
-sequence_table_attach_widget (GdauiServerOperation *form, GtkWidget *table, GtkWidget *wid,
-			      const gchar *path, gint index)
+sequence_grid_attach_widget (GdauiServerOperation *form, GtkWidget *grid, GtkWidget *wid,
+			     const gchar *path, gint index)
 {
 	GtkWidget *image;
 	gboolean expand;
@@ -377,17 +377,14 @@ sequence_table_attach_widget (GdauiServerOperation *form, GtkWidget *table, GtkW
 
 	/* new widget */
 	expand = g_object_get_data (G_OBJECT (wid), "expand") ?  TRUE : FALSE;
-	gtk_table_attach (GTK_TABLE (table), wid, 0, 1, index, index + 1,
-			  GTK_FILL | GTK_EXPAND,
-			  expand ? (GTK_FILL | GTK_EXPAND) : GTK_SHRINK, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), wid, 0, index, 1, 1);
 	gtk_widget_show (wid);
 
 	/* "-" button */
 	image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
 	wid = gtk_button_new ();
 	gtk_button_set_image (GTK_BUTTON (wid), image);
-	gtk_table_attach (GTK_TABLE (table), wid, 1, 2, index, index + 1,
-			  GTK_SHRINK, GTK_SHRINK | GTK_FILL, 0, 0);
+	gtk_grid_attach (GTK_GRID (grid), wid, 1, index, 1, 1);
 	gtk_widget_show (wid);
 	g_object_set_data_full (G_OBJECT (wid), "_seq_path", g_strdup (path), g_free);
 	g_object_set_data (G_OBJECT (wid), "_index", GINT_TO_POINTER (index+1));
@@ -545,7 +542,7 @@ fill_create_widget (GdauiServerOperation *form, const gchar *path, gchar **secti
 	}
 	case GDA_SERVER_OPERATION_NODE_SEQUENCE: {
 		guint n, size;
-		GtkWidget *table, *wid, *image;
+		GtkWidget *grid, *wid, *image;
 		WidgetData *wdp, *wd;
 		gchar *parent_path = NULL, *path_name = NULL;
 		guint max;
@@ -565,18 +562,18 @@ fill_create_widget (GdauiServerOperation *form, const gchar *path, gchar **secti
 						     GTK_SHADOW_NONE);
 
 		size = gda_server_operation_get_sequence_size (form->priv->op, path);
-		table = gtk_table_new (size + 1, 2, FALSE);
-		gtk_table_set_row_spacings (GTK_TABLE (table), 10);
-		gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (plwid), table);
+		grid = gtk_grid_new ();
+		gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
+		gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (plwid), grid);
 		gtk_viewport_set_shadow_type (GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (plwid))),
 					      GTK_SHADOW_NONE);
-		gtk_widget_show (table);
+		gtk_widget_show (grid);
 
 		parent_path = gda_server_operation_get_node_parent (form->priv->op, path);
 		path_name = gda_server_operation_get_node_path_portion (form->priv->op, path);
 		wdp = widget_data_find (form, parent_path);
 		wd = widget_data_new (wdp, path_name);
-		wd->widget = table;
+		wd->widget = grid;
 		if (! wdp)
 			form->priv->widget_data = g_slist_append (form->priv->widget_data, wd);
 		g_free (parent_path);
@@ -589,7 +586,7 @@ fill_create_widget (GdauiServerOperation *form, const gchar *path, gchar **secti
 
 			str = g_strdup_printf ("%s/%d", path, n);
 			wid = fill_create_widget (form, str, NULL, NULL);
-			sequence_table_attach_widget (form, table, wid, path, n);
+			sequence_grid_attach_widget (form, grid, wid, path, n);
 			g_free (str);
 		}
 
@@ -597,15 +594,13 @@ fill_create_widget (GdauiServerOperation *form, const gchar *path, gchar **secti
 			/* last row is for new entries */
 			wid = gtk_label_new (_("Add"));
 			gtk_misc_set_alignment (GTK_MISC (wid), .0, -1);
-			gtk_table_attach (GTK_TABLE (table), wid, 0, 1, size, size + 1,
-					  GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+			gtk_grid_attach (GTK_GRID (grid), wid, 0, size, 1, 1);
 			gtk_widget_show (wid);
 
 			image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
 			wid = gtk_button_new ();
 			gtk_button_set_image (GTK_BUTTON (wid), image);
-			gtk_table_attach (GTK_TABLE (table), wid, 1, 2, size, size + 1,
-					  GTK_SHRINK, GTK_SHRINK, 0, 0);
+			gtk_grid_attach (GTK_GRID (grid), wid, 1, size, 1, 1);
 			gtk_widget_show (wid);
 
 			g_signal_connect (G_OBJECT (wid), "clicked",
@@ -626,10 +621,10 @@ fill_create_widget (GdauiServerOperation *form, const gchar *path, gchar **secti
 		node_names = gda_server_operation_get_sequence_item_names (form->priv->op, path);
 		size = g_strv_length (node_names);
 		if (size > 1) {
-			GtkWidget *table;
+			GtkWidget *grid;
 			gint i, tab_index;
 
-			table = gtk_table_new (size, 2, FALSE);
+			grid = gtk_grid_new ();
 			for (i = 0, tab_index = 0; i < size; i++) {
 				GtkWidget *wid;
 				GSList *lab_list, *list;
@@ -648,9 +643,8 @@ fill_create_widget (GdauiServerOperation *form, const gchar *path, gchar **secti
 							g_object_ref (label_entry);
 							gtk_container_remove (GTK_CONTAINER (parent), label_entry);
 						}
-						gtk_table_attach (GTK_TABLE (table), label_entry,
-								  0, 1, tab_index, tab_index+1,
-								  GTK_FILL | GTK_SHRINK, GTK_SHRINK, 0, 0);
+						gtk_grid_attach (GTK_GRID (grid), label_entry,
+								 0, tab_index, 1, 1);
 						if (parent)
 							g_object_unref (label_entry);
 					}
@@ -663,19 +657,15 @@ fill_create_widget (GdauiServerOperation *form, const gchar *path, gchar **secti
 				expand = g_object_get_data (G_OBJECT (wid), "expand") ? TRUE : FALSE;
 				seq_expand = seq_expand || expand;
 				if (nb_labels > 0)
-					gtk_table_attach (GTK_TABLE (table), wid, 1, 2,
-							  tab_index - nb_labels, tab_index,
-							  GTK_FILL | GTK_EXPAND,
-							  expand ? (GTK_FILL | GTK_EXPAND) : GTK_SHRINK, 0, 0);
+					gtk_grid_attach (GTK_GRID (grid), wid, 1,
+							 tab_index - nb_labels, 1, nb_labels);
 				else {
-					gtk_table_attach (GTK_TABLE (table), wid, 1, 2, tab_index, tab_index +1,
-							  GTK_FILL | GTK_EXPAND,
-							  expand ? (GTK_FILL | GTK_EXPAND) : GTK_SHRINK, 0, 0);
+					gtk_grid_attach (GTK_GRID (grid), wid, 1, tab_index, 1, 1);
 					tab_index += 1;
 				}
 				gtk_widget_show (wid);
 			}
-			plwid = table;
+			plwid = grid;
 		}
 		else
 			plwid = fill_create_widget (form, node_names[0], NULL, NULL);
@@ -903,7 +893,7 @@ struct MoveChild {
 static void
 sequence_item_added_cb (GdaServerOperation *op, const gchar *seq_path, gint item_index, GdauiServerOperation *form)
 {
-	GtkWidget *table;
+	GtkWidget *grid;
 	GList *children, *list, *to_move = NULL;
 	GtkWidget *wid;
 	gchar *str;
@@ -916,20 +906,17 @@ sequence_item_added_cb (GdaServerOperation *op, const gchar *seq_path, gint item
 
 	wd = widget_data_find (form, seq_path);
 	g_assert (wd);
-	table = wd->widget;
-	g_assert (table);
-
-	/* resize table */
-	gtk_table_resize (GTK_TABLE (table), size+1, 2);
+	grid = wd->widget;
+	g_assert (grid);
 
 	/* move children DOWN if necessary */
-	children = gtk_container_get_children (GTK_CONTAINER (table));
+	children = gtk_container_get_children (GTK_CONTAINER (grid));
 	for (list = children; list; list = list->next) {
 		GtkWidget *child = GTK_WIDGET (list->data);
 
 		if (child) {
 			guint top_attach, left_attach;
-			gtk_container_child_get (GTK_CONTAINER (table), child,
+			gtk_container_child_get (GTK_CONTAINER (grid), child,
 						 "top-attach", &top_attach,
 						 "left-attach", &left_attach, NULL);
 			/* ADD/REMOVE button sensitivity */
@@ -964,9 +951,9 @@ sequence_item_added_cb (GdaServerOperation *op, const gchar *seq_path, gint item
 		struct MoveChild *mc;
 
 		mc = (struct MoveChild *) (list->data);
-		gtk_container_child_set (GTK_CONTAINER (table), mc->widget,
+		gtk_container_child_set (GTK_CONTAINER (grid), mc->widget,
 					 "top-attach", mc->top_attach,
-					 "bottom-attach", mc->top_attach + 1, NULL);
+					 "height", 1, NULL);
 		g_free (list->data);
 	}
 	g_list_free (to_move);
@@ -974,7 +961,7 @@ sequence_item_added_cb (GdaServerOperation *op, const gchar *seq_path, gint item
 	/* add widget corresponding to the new sequence item */
 	str = g_strdup_printf ("%s/%d", seq_path, item_index);
 	wid = fill_create_widget (form, str, NULL, NULL);
-	sequence_table_attach_widget (form, table, wid, seq_path, item_index);
+	sequence_grid_attach_widget (form, grid, wid, seq_path, item_index);
 	g_free (str);
 }
 
@@ -984,7 +971,7 @@ sequence_item_added_cb (GdaServerOperation *op, const gchar *seq_path, gint item
 static void
 sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint item_index, GdauiServerOperation *form)
 {
-	GtkWidget *table;
+	GtkWidget *grid;
 	GList *children, *list, *to_move = NULL;
 	gchar *str;
 	WidgetData *wds, *wdi;
@@ -996,8 +983,8 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
 
 	wds = widget_data_find (form, seq_path);
 	g_assert (wds);
-	table = wds->widget;
-	g_assert (table);
+	grid = wds->widget;
+	g_assert (grid);
 
 	/* remove widget */
 	str = g_strdup_printf ("%s/%d", seq_path, item_index);
@@ -1010,17 +997,17 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
 	widget_data_free (wdi);
 
 	/* remove the widget associated to the sequence item */
-	children = gtk_container_get_children (GTK_CONTAINER (table));
+	children = gtk_container_get_children (GTK_CONTAINER (grid));
 	for (list = children; list; ) {
 		GtkWidget *child = GTK_WIDGET (list->data);
 		if (child) {
 			guint top_attach;
-			gtk_container_child_get (GTK_CONTAINER (table), child,
+			gtk_container_child_get (GTK_CONTAINER (grid), child,
 						 "top-attach", &top_attach, NULL);
 			if (top_attach == (guint)item_index) {
 				gtk_widget_destroy (child);
 				g_list_free (children);
-				children = gtk_container_get_children (GTK_CONTAINER (table));
+				children = gtk_container_get_children (GTK_CONTAINER (grid));
 				list = children;
 				continue;
 			}
@@ -1030,12 +1017,12 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
 	g_list_free (children);
 
 	/* move children UP if necessary */
-	children = gtk_container_get_children (GTK_CONTAINER (table));
+	children = gtk_container_get_children (GTK_CONTAINER (grid));
 	for (list = children; list; list = list->next) {
 		GtkWidget *child = GTK_WIDGET (list->data);
 		if (child) {
 			guint top_attach, left_attach;
-			gtk_container_child_get (GTK_CONTAINER (table), child,
+			gtk_container_child_get (GTK_CONTAINER (grid), child,
 						 "top-attach", &top_attach,
 						 "left-attach", &left_attach, NULL);
 			/* ADD/REMOVE button sensitivity */
@@ -1069,15 +1056,12 @@ sequence_item_remove_cb (GdaServerOperation *op, const gchar *seq_path, gint ite
 		struct MoveChild *mc;
 
 		mc = (struct MoveChild *) (list->data);
-		gtk_container_child_set (GTK_CONTAINER (table), mc->widget,
+		gtk_container_child_set (GTK_CONTAINER (grid), mc->widget,
 					 "top-attach", mc->top_attach,
-					 "bottom-attach", mc->top_attach + 1, NULL);
+					 "height", 1, NULL);
 		g_free (list->data);
 	}
 	g_list_free (to_move);
-
-	/* resize table */
-	gtk_table_resize (GTK_TABLE (table), size, 2);
 }
 
 
diff --git a/libgda-ui/gdaui-set.c b/libgda-ui/gdaui-set.c
index 3addc29..94aa523 100644
--- a/libgda-ui/gdaui-set.c
+++ b/libgda-ui/gdaui-set.c
@@ -236,7 +236,7 @@ wrapped_set_public_data_changed_cb (G_GNUC_UNUSED GdaSet *wset, GdauiSet *set)
 static void
 wrapped_set_source_model_changed_cb (G_GNUC_UNUSED GdaSet *wset, GdaSetSource *source, GdauiSet *set)
 {
-	GdauiSetSource *uisource;
+	GdauiSetSource *uisource = NULL;
 	GSList *list;
 	for (list = set->sources_list; list; list = list->next) {
 		if (((GdauiSetSource*) list->data)->source == source) {
diff --git a/libgda-ui/internal/popup-container.c b/libgda-ui/internal/popup-container.c
index 49cf509..e82a107 100644
--- a/libgda-ui/internal/popup-container.c
+++ b/libgda-ui/internal/popup-container.c
@@ -142,10 +142,8 @@ default_position_func (G_GNUC_UNUSED PopupContainer *container, gint *out_x, gin
 {
 	GdkDeviceManager *manager;
 	GdkDevice *pointer;
-	GdkWindow *window;
 	GtkWidget *widget;
 	widget = GTK_WIDGET (container);
-	window = gtk_widget_get_window (widget);
 	manager = gdk_display_get_device_manager (gtk_widget_get_display (widget));
 	pointer = gdk_device_manager_get_client_pointer (manager);
 	gdk_device_get_position (pointer, NULL, out_x, out_y);
diff --git a/tools/browser/common/widget-overlay.c b/tools/browser/common/widget-overlay.c
index 47dbbd8..46bcb35 100644
--- a/tools/browser/common/widget-overlay.c
+++ b/tools/browser/common/widget-overlay.c
@@ -244,7 +244,8 @@ widget_overlay_set_property (GObject *object,
 			else if (need_scale) {
 				GtkWidget *box, *wid, *button, *image;
 				box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-				wid = gtk_vscale_new_with_range (SCALE_MIN, SCALE_MAX, SCALE_STEP);
+				wid = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
+								SCALE_MIN, SCALE_MAX, SCALE_STEP);
 				ovl->priv->scale_range = GTK_RANGE (wid);
 				g_object_set (G_OBJECT (wid), "draw-value", FALSE, NULL);
 				gtk_box_pack_start (GTK_BOX (box), wid, TRUE, TRUE, 0);
@@ -615,10 +616,9 @@ widget_overlay_realize (GtkWidget *widget)
 	g_signal_connect (win, "pick-embedded-child",
 			  G_CALLBACK (pick_offscreen_child), ovl);
 
-	GtkStyle *style;
-	style = gtk_widget_get_style (widget);
-	style = gtk_style_attach (style, win);
-	gtk_widget_set_style (widget, style);
+	GtkStyleContext *style;
+	style = gtk_widget_get_style_context (widget);
+	gtk_style_context_set_background (style, win);
 	
 	/* offscreen windows */
 	attributes.window_type = GDK_WINDOW_OFFSCREEN;
@@ -644,8 +644,7 @@ widget_overlay_realize (GtkWidget *widget)
 		g_signal_connect (cd->offscreen_window, "from-embedder",
 				  G_CALLBACK (offscreen_window_from_parent), ovl);
 
-		//gtk_style_set_background (style, win, GTK_STATE_NORMAL);
-		gtk_style_set_background (style, cd->offscreen_window, GTK_STATE_NORMAL);
+		gtk_style_context_set_background (style, cd->offscreen_window);
 		gdk_window_show (cd->offscreen_window);
 	}
 }
diff --git a/tools/browser/query-exec/query-console-page.c b/tools/browser/query-exec/query-console-page.c
index 9611eca..91fb079 100644
--- a/tools/browser/query-exec/query-console-page.c
+++ b/tools/browser/query-exec/query-console-page.c
@@ -772,7 +772,7 @@ sql_favorite_clicked_cb (G_GNUC_UNUSED GtkButton *button, QueryConsolePage *tcon
 static void
 fav_form_name_activated_cb (G_GNUC_UNUSED GtkWidget *form, GtkWidget *dlg)
 {
-	gtk_dialog_response (dlg, GTK_RESPONSE_ACCEPT);
+	gtk_dialog_response (GTK_DIALOG (dlg), GTK_RESPONSE_ACCEPT);
 }
 
 static void
@@ -860,7 +860,8 @@ popup_container_position_func (PopupContainer *cont, gint *out_x, gint *out_y)
 
 	console = g_object_get_data (G_OBJECT (cont), "console");
 	top = gtk_widget_get_toplevel (console);	
-        gtk_widget_size_request ((GtkWidget*) cont, &req);
+	gtk_widget_get_preferred_size ((GtkWidget*) cont, NULL, &req);
+
 	GtkAllocation alloc;
         gdk_window_get_origin (gtk_widget_get_window (top), &x, &y);
 	gtk_widget_get_allocation (top, &alloc);
diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c
index 37cf091..11ca4b5 100644
--- a/tools/browser/query-exec/query-editor.c
+++ b/tools/browser/query-exec/query-editor.c
@@ -136,8 +136,8 @@ static gint query_editor_signals[LAST_SIGNAL] = { 0, 0, 0, 0 };
 static void
 create_tags_for_sql (QueryEditor *editor, const gchar *language)
 {
-	GtkTextBuffer *buffer;
 #ifdef HAVE_GTKSOURCEVIEW
+	GtkTextBuffer *buffer;
 	GtkSourceLanguageManager *mgr;
 	GtkSourceLanguage *lang;
 	gchar ** current_search_path;
@@ -151,8 +151,8 @@ create_tags_for_sql (QueryEditor *editor, const gchar *language)
 	g_return_if_fail (language != NULL);
 	g_return_if_fail (!strcmp (language, QUERY_EDITOR_LANGUAGE_SQL));
 
-	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (editor->priv->text));
 #ifdef HAVE_GTKSOURCEVIEW
+	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (editor->priv->text));
 	mgr = gtk_source_language_manager_new ();
 
 	/* alter search path */
@@ -430,12 +430,13 @@ display_completions (QueryEditor *editor)
 				gtk_tree_selection_select_iter (gtk_tree_view_get_selection (editor->priv->completion_treeview),
 								&iter);
 
+			GtkRequisition nat_req;
 			g_object_set ((GObject*) editor->priv->completion_renderer, "text", compl[i], NULL);
-			gtk_cell_renderer_get_size (editor->priv->completion_renderer,
-						    (GtkWidget*) editor->priv->completion_treeview,
-						    NULL, NULL, NULL, &w, &h);
-			width = MAX (width, w);
-			height += h + 2;
+			gtk_cell_renderer_get_preferred_size (editor->priv->completion_renderer,
+							      (GtkWidget*) editor->priv->completion_treeview,
+							      NULL, &nat_req);
+			width = MAX (width, nat_req.width);
+			height += nat_req.height + 2;
 		}
 		g_strfreev (compl);
 		
diff --git a/tools/browser/schema-browser/relations-diagram.c b/tools/browser/schema-browser/relations-diagram.c
index c4e79e3..b981f77 100644
--- a/tools/browser/schema-browser/relations-diagram.c
+++ b/tools/browser/schema-browser/relations-diagram.c
@@ -172,12 +172,12 @@ relations_diagram_set_property (GObject *object,
 				G_GNUC_UNUSED const GValue *value,
 				GParamSpec *pspec)
 {
-	RelationsDiagram *diagram;
-	diagram = RELATIONS_DIAGRAM (object);
+	/*RelationsDiagram *diagram;
+	  diagram = RELATIONS_DIAGRAM (object);*/
 	switch (param_id) {
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-			break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+		break;
 	}
 }
 
@@ -187,12 +187,12 @@ relations_diagram_get_property (GObject *object,
 				G_GNUC_UNUSED GValue *value,
 				GParamSpec *pspec)
 {
-	RelationsDiagram *diagram;
-	diagram = RELATIONS_DIAGRAM (object);
+	/*RelationsDiagram *diagram;
+	  diagram = RELATIONS_DIAGRAM (object);*/
 	switch (param_id) {
-		default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-			break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+		break;
 	}
 }
 
diff --git a/tools/browser/schema-browser/table-columns.c b/tools/browser/schema-browser/table-columns.c
index d492f1d..78681c1 100644
--- a/tools/browser/schema-browser/table-columns.c
+++ b/tools/browser/schema-browser/table-columns.c
@@ -843,10 +843,14 @@ static gboolean
 visibility_notify_event (GtkWidget *text_view, G_GNUC_UNUSED GdkEventVisibility *event,
 			 TableColumns *tcolumns)
 {
-	gint wx, wy, bx, by;
-	
-	gdk_window_get_pointer (gtk_widget_get_window (text_view), &wx, &wy, NULL);
 	
+	gint wx, wy, bx, by;
+	GdkDeviceManager *manager;
+	GdkDevice *pointer;
+
+	manager = gdk_display_get_device_manager (gtk_widget_get_display (text_view));
+	pointer = gdk_device_manager_get_client_pointer (manager);
+	gdk_window_get_device_position (gtk_widget_get_window (text_view), pointer, &wx, &wy, NULL);
 	gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
 					       GTK_TEXT_WINDOW_WIDGET,
 					       wx, wy, &bx, &by);
@@ -870,8 +874,6 @@ motion_notify_event (GtkWidget *text_view, GdkEventMotion *event, TableColumns *
 	
 	set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y, tcolumns);
 
-	gdk_window_get_pointer (gtk_widget_get_window (text_view), NULL, NULL, NULL);
-
 	return FALSE;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]