[Xfce4-commits] [apps/gigolo] 04/35: Stop using our own wrappers, use plain gtk functions
noreply at xfce.org
noreply at xfce.org
Mon Oct 31 18:18:38 CET 2016
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 6bdd110b353806ececbfba9a843476e8e5ed5528
Author: Landry Breuil <landry at xfce.org>
Date: Fri Jun 17 22:42:26 2016 +0200
Stop using our own wrappers, use plain gtk functions
---
src/bookmarkdialog.c | 2 +-
src/bookmarkeditdialog.c | 6 +++---
src/browsenetworkpanel.c | 4 ++--
src/mountdialog.c | 2 +-
src/preferencesdialog.c | 2 +-
src/window.c | 6 +++---
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index c283cc5..950cc97 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -412,7 +412,7 @@ static void gigolo_bookmark_dialog_init(GigoloBookmarkDialog *dialog)
"title", _("Edit Bookmarks"),
NULL);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
- vbox = gigolo_dialog_get_content_area(GTK_DIALOG(dialog));
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_box_set_spacing(GTK_BOX(vbox), 2);
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 16b1cf4..af4e637 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -224,7 +224,7 @@ gint gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
/* perform some error checking and don't return until entered values are sane */
else
{
- if (gigolo_widget_get_flags(priv->name_entry) & GTK_VISIBLE)
+ if (gtk_widget_is_visible(priv->name_entry))
{ /* check the name only if we are creating/editing a bookmark */
tmp = gtk_entry_get_text(GTK_ENTRY(priv->name_entry));
if (! *tmp)
@@ -1013,7 +1013,7 @@ static void gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
priv->dialog_type = GIGOLO_BE_MODE_EDIT;
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
- gtk_box_set_spacing(GTK_BOX(gigolo_dialog_get_content_area(GTK_DIALOG(dialog))), 2);
+ gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), 2);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
@@ -1022,7 +1022,7 @@ static void gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
vbox = gtk_vbox_new(FALSE, 6);
gtk_container_set_border_width(GTK_CONTAINER (vbox), 5);
- gtk_box_pack_start(GTK_BOX(gigolo_dialog_get_content_area(GTK_DIALOG(dialog))),
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
vbox, FALSE, TRUE, 0);
hbox = gtk_hbox_new(FALSE, 6);
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index d0cdc09..06d1826 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -215,7 +215,7 @@ static void browse_network_finished_cb(G_GNUC_UNUSED GigoloBackendGVFS *bnd, Gig
gtk_widget_set_sensitive(priv->button_refresh, TRUE);
- gdk_window_set_cursor(gigolo_widget_get_window(GTK_WIDGET(panel)), NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(panel)), NULL);
}
@@ -235,7 +235,7 @@ static gboolean delay_refresh(GigoloBrowseNetworkPanel *panel)
{
GigoloBrowseNetworkPanelPrivate *priv = GIGOLO_BROWSE_NETWORK_PANEL_GET_PRIVATE(panel);
- gdk_window_set_cursor(gigolo_widget_get_window(GTK_WIDGET(panel)), priv->wait_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(panel)), priv->wait_cursor);
/* Force the update of the cursor */
while (g_main_context_iteration(NULL, FALSE));
diff --git a/src/mountdialog.c b/src/mountdialog.c
index f365e6b..5ad14ac 100644
--- a/src/mountdialog.c
+++ b/src/mountdialog.c
@@ -103,7 +103,7 @@ static void gigolo_mount_dialog_init(GigoloMountDialog *self)
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
- gtk_container_add(GTK_CONTAINER(gigolo_dialog_get_content_area(GTK_DIALOG(self))), vbox);
+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(self))), vbox);
priv->label = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(priv->label), 0.1, 0.5);
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index c9747d9..7580ed7 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -310,7 +310,7 @@ static void set_settings(GigoloPreferencesDialog *dialog, GigoloSettings *settin
GtkWidget *label1, *label2, *label3, *label4, *image;
GtkSizeGroup *sg;
- vbox = gigolo_dialog_get_content_area(GTK_DIALOG(dialog));
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
if (gigolo_is_desktop_xfce())
{
diff --git a/src/window.c b/src/window.c
index 43e2004..e170461 100644
--- a/src/window.c
+++ b/src/window.c
@@ -125,7 +125,7 @@ static void gigolo_window_destroy(GigoloWindow *window)
if (gigolo_settings_get_boolean(priv->settings, "save-geometry"))
{
- GdkWindow *gdk_window = gigolo_widget_get_window(GTK_WIDGET(window));
+ GdkWindow *gdk_window = gtk_widget_get_window(GTK_WIDGET(window));
gtk_window_get_position(GTK_WINDOW(window), &geo[0], &geo[1]);
gtk_window_get_size(GTK_WINDOW(window), &geo[2], &geo[3]);
if (gdk_window != NULL && gdk_window_get_state(gdk_window) & GDK_WINDOW_STATE_MAXIMIZED)
@@ -1082,7 +1082,7 @@ static void gigolo_window_set_toolbar_orientation(GigoloWindow *window, gint ori
{
GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(window);
- gigolo_toolbar_set_orientation(GTK_TOOLBAR(priv->toolbar), orientation);
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(priv->toolbar), orientation);
if (orientation == GTK_ORIENTATION_HORIZONTAL && priv->vbox != gtk_widget_get_parent(priv->toolbar))
{
gtk_container_remove(GTK_CONTAINER(priv->hbox_view), priv->toolbar);
@@ -1629,7 +1629,7 @@ static void gigolo_window_init(GigoloWindow *window)
/* Status icon */
priv->systray_icon = gtk_status_icon_new_from_icon_name(gigolo_get_application_icon_name());
- gigolo_status_icon_set_tooltip_text(priv->systray_icon, _("Gigolo"));
+ gtk_status_icon_set_tooltip_text(priv->systray_icon, _("Gigolo"));
g_signal_connect(priv->systray_icon, "activate", G_CALLBACK(systray_icon_activate_cb), window);
g_signal_connect(priv->systray_icon, "popup-menu", G_CALLBACK(systray_icon_popup_menu_cb), window);
g_signal_connect(priv->systray_icon, "notify", G_CALLBACK(gigolo_window_systray_notify_cb), window);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list