[Xfce4-commits] [apps/xfce4-dict] 10/43: Stop poking at widget internals, use accessors

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

andre pushed a commit to branch master
in repository apps/xfce4-dict.

commit 63106163ccab2c6cd8d7347863aa8bef0c89e54c
Author: Andre Miranda <andre42m at gmail.com>
Date:   Wed Jul 20 22:47:52 2016 -0300

    Stop poking at widget internals, use accessors
---
 lib/dictd.c                      | 4 ++--
 lib/gui.c                        | 2 +-
 lib/prefs.c                      | 2 +-
 lib/speedreader.c                | 4 ++--
 panel-plugin/xfce4-dict-plugin.c | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/dictd.c b/lib/dictd.c
index 28f5451..8c75cbf 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -650,7 +650,7 @@ static void signal_cb(gint sig)
 }
 
 
-static void dictd_init()
+static void dictd_init(void)
 {
 #ifdef SIGALRM
 	static gboolean initialized = FALSE;
@@ -753,7 +753,7 @@ void dict_dictd_get_information(GtkWidget *button, DictData *dd)
 				"gtk-close", GTK_RESPONSE_CLOSE, NULL);
 	vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+	gtk_container_add(GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox);
 	gtk_box_set_spacing(GTK_BOX(vbox), 6);
 	g_free(text);
 
diff --git a/lib/gui.c b/lib/gui.c
index 1c826e1..86a63b4 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -977,7 +977,7 @@ void dict_gui_query_geometry(DictData *dd)
 	gtk_window_get_position(GTK_WINDOW(dd->window),	&dd->geometry[0], &dd->geometry[1]);
 	gtk_window_get_size(GTK_WINDOW(dd->window),	&dd->geometry[2], &dd->geometry[3]);
 
-	if (gdk_window_get_state(dd->window->window) & GDK_WINDOW_STATE_MAXIMIZED)
+	if (gdk_window_get_state(gtk_widget_get_window(dd->window)) & GDK_WINDOW_STATE_MAXIMIZED)
 		dd->geometry[4] = 1;
 	else
 		dd->geometry[4] = 0;
diff --git a/lib/prefs.c b/lib/prefs.c
index 9aad6c5..25c7cb3 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -278,7 +278,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
 	GTK_WIDGET_UNSET_FLAGS(notebook, GTK_CAN_FOCUS);
 	gtk_widget_show(notebook);
 	g_object_set_data(G_OBJECT(dialog), "notebook", notebook);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), notebook, FALSE, TRUE, 0);
 	gtk_container_set_border_width(GTK_CONTAINER(notebook), 5);
 
 	/*
diff --git a/lib/speedreader.c b/lib/speedreader.c
index dc68391..9c3bd61 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -708,8 +708,8 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
 
 	gtk_widget_grab_focus(textview);
 
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), priv->first_page, TRUE, TRUE, 6);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), priv->second_page, TRUE, TRUE, 6);
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), priv->first_page, TRUE, TRUE, 6);
+	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), priv->second_page, TRUE, TRUE, 6);
 
 	xfd_speed_reader_set_window_title(dialog, XSR_STATE_INITIAL);
 }
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 6ba3cee..b137292 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -184,7 +184,7 @@ static gboolean dict_plugin_set_selection(DictPanelData *dpd)
 
 	win = gtk_invisible_new();
 	gtk_widget_realize(win);
-	xwin = GDK_WINDOW_XID(GTK_WIDGET(win)->window);
+	xwin = GDK_WINDOW_XID(gtk_widget_get_window (GTK_WIDGET(win)));
 
 	gscreen = gtk_widget_get_screen(win);
 	g_snprintf(selection_name, sizeof (selection_name),
@@ -334,7 +334,7 @@ static gboolean entry_buttonpress_cb(GtkWidget *entry, GdkEventButton *event, Di
 	toplevel = gtk_widget_get_toplevel(entry);
 
 	/* Grab entry focus if possible */
-	if (event->button != 3 && toplevel && toplevel->window)
+	if (event->button != 3 && toplevel && gtk_widget_get_window (toplevel))
 		xfce_panel_plugin_focus_widget(dpd->plugin, entry);
 
 	return FALSE;
@@ -350,11 +350,11 @@ static void entry_changed_cb(GtkEditable *editable, DictPanelData *dpd)
 static void dict_plugin_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context,
 		gint x, gint y, GtkSelectionData *data, guint info, guint ltime, DictPanelData *dpd)
 {
-	if ((data != NULL) && (data->length >= 0) && (data->format == 8))
+	if ((data != NULL) && (gtk_selection_data_get_length(data) >= 0) && (gtk_selection_data_get_format(data) == 8))
 	{
 		if (widget == dpd->panel_button || widget == dpd->dd->panel_entry)
 		{
-			gtk_entry_set_text(GTK_ENTRY(dpd->dd->main_entry), (const gchar*) data->data);
+			gtk_entry_set_text(GTK_ENTRY(dpd->dd->main_entry), (const gchar*) gtk_selection_data_get_data(data));
 		}
 
 		dict_drag_data_received(widget, drag_context, x, y, data, info, ltime, dpd->dd);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.