[Xfce4-commits] [panel-plugins/xfce4-places-plugin] 05/30: Handle deprecations
noreply at xfce.org
noreply at xfce.org
Mon Apr 22 12:07:56 CEST 2019
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-places-plugin.
commit 0ff1f698eb47fc864f352e29e6a110eb90a174e4
Author: Andre Miranda <andreldm at xfce.org>
Date: Mon Mar 19 22:30:24 2018 -0300
Handle deprecations
---
panel-plugin/button.c | 13 +++++++------
panel-plugin/cfg.c | 40 ++++++++++++++++++++--------------------
panel-plugin/view.c | 4 ++--
3 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/panel-plugin/button.c b/panel-plugin/button.c
index 2295097..43f20e7 100644
--- a/panel-plugin/button.c
+++ b/panel-plugin/button.c
@@ -244,16 +244,17 @@ places_button_construct(PlacesButton *self, XfcePanelPlugin *plugin)
self->plugin = plugin;
/* from libxfce4panel */
- GTK_WIDGET_UNSET_FLAGS(self, GTK_CAN_DEFAULT|GTK_CAN_FOCUS);
+ gtk_widget_set_can_default (GTK_WIDGET(self), FALSE);
+ gtk_widget_set_can_focus (GTK_WIDGET(self), FALSE);
gtk_button_set_relief(GTK_BUTTON(self), GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click(GTK_BUTTON(self), FALSE);
+ gtk_widget_set_focus_on_click(GTK_WIDGET(self), FALSE);
self->alignment = gtk_alignment_new (0.0, 0.5, 1.0, 1.0);
gtk_container_add(GTK_CONTAINER(self), self->alignment);
gtk_widget_show(self->alignment);
orientation = xfce_panel_plugin_get_orientation(self->plugin);
- self->box = xfce_hvbox_new(orientation, FALSE, BOX_SPACING);
+ self->box = gtk_box_new(orientation, BOX_SPACING);
gtk_container_set_border_width(GTK_CONTAINER(self->box), 0);
gtk_container_add(GTK_CONTAINER(self->alignment), self->box);
gtk_widget_show(self->box);
@@ -458,9 +459,9 @@ static void
places_button_mode_changed(XfcePanelPlugin *plugin, XfcePanelPluginMode mode, PlacesButton *self)
{
DBG("orientation changed");
- xfce_hvbox_set_orientation(XFCE_HVBOX(self->box),
- (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
- GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (self->box),
+ (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
+ GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
places_button_resize(self);
}
diff --git a/panel-plugin/cfg.c b/panel-plugin/cfg.c
index f32747f..bb64017 100644
--- a/panel-plugin/cfg.c
+++ b/panel-plugin/cfg.c
@@ -405,7 +405,7 @@ pcfg_make_empty_dialog(PlacesCfg *cfg)
dlg = xfce_titled_dialog_new_with_buttons(_("Places"),
NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
@@ -429,22 +429,22 @@ places_cfg_open_dialog(PlacesCfg *cfg)
GtkWidget *frame_search, *vbox_search;
GtkWidget *tmp_box, *tmp_label, *tmp_widget;
- GtkObject * adj;
+ GtkAdjustment *adj;
DBG("configure plugin");
dlg = pcfg_make_empty_dialog(cfg);
/* BUTTON: frame, vbox */
- vbox_button = gtk_vbox_new(FALSE, 4);
+ vbox_button = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_button);
frame_button = xfce_gtk_frame_box_new_with_content(_("Button"), vbox_button);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_button, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dlg))), frame_button, FALSE, FALSE, 0);
/* BUTTON: Show Icon/Label */
- tmp_box = gtk_hbox_new(FALSE, 15);
+ tmp_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 15);
gtk_widget_show(tmp_box);
gtk_box_pack_start(GTK_BOX(vbox_button), tmp_box, FALSE, FALSE, 0);
@@ -452,11 +452,11 @@ places_cfg_open_dialog(PlacesCfg *cfg)
gtk_widget_show(tmp_label);
gtk_box_pack_start(GTK_BOX(tmp_box), tmp_label, FALSE, FALSE, 0);
- tmp_widget = gtk_combo_box_new_text();
+ tmp_widget = gtk_combo_box_text_new();
gtk_label_set_mnemonic_widget(GTK_LABEL(tmp_label), tmp_widget);
- gtk_combo_box_append_text(GTK_COMBO_BOX(tmp_widget), _("Icon Only"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(tmp_widget), _("Label Only"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(tmp_widget), _("Icon and Label"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tmp_widget), _("Icon Only"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tmp_widget), _("Label Only"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(tmp_widget), _("Icon and Label"));
exo_mutual_binding_new (G_OBJECT (cfg), "show-button-type",
G_OBJECT (tmp_widget), "active");
@@ -465,7 +465,7 @@ places_cfg_open_dialog(PlacesCfg *cfg)
gtk_box_pack_start(GTK_BOX(tmp_box), tmp_widget, FALSE, FALSE, 0);
/* BUTTON: Label text entry */
- tmp_box = gtk_hbox_new(FALSE, 15);
+ tmp_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 15);
gtk_widget_show(tmp_box);
gtk_box_pack_start(GTK_BOX(vbox_button), tmp_box, FALSE, FALSE, 0);
@@ -482,11 +482,11 @@ places_cfg_open_dialog(PlacesCfg *cfg)
gtk_box_pack_start(GTK_BOX(tmp_box), tmp_widget, FALSE, FALSE, 0);
/* MENU: frame, vbox */
- vbox_menu = gtk_vbox_new(FALSE, 4);
+ vbox_menu = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_menu);
frame_menu = xfce_gtk_frame_box_new_with_content(_("Menu"), vbox_menu);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_menu, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dlg))), frame_menu, FALSE, FALSE, 0);
/* MENU: Show Icons */
tmp_widget = gtk_check_button_new_with_mnemonic(_("Show _icons in menu"));
@@ -506,7 +506,7 @@ places_cfg_open_dialog(PlacesCfg *cfg)
gtk_box_pack_start(GTK_BOX(vbox_menu), tmp_widget, FALSE, FALSE, 0);
/* MENU: - Mount and Open (indented) */
- tmp_box = gtk_hbox_new(FALSE, 15);
+ tmp_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 15);
/* Gray out this box when "Show removable media" is off */
exo_binding_new (G_OBJECT (cfg), "show-volumes",
@@ -545,7 +545,7 @@ places_cfg_open_dialog(PlacesCfg *cfg)
gtk_box_pack_start(GTK_BOX(vbox_menu), tmp_widget, FALSE, FALSE, 0);
/* RECENT DOCUMENTS: frame, vbox */
- vbox_recent = gtk_vbox_new(FALSE, 4);
+ vbox_recent = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_recent);
/* Gray out this box when "Show recent documents" is off */
@@ -553,7 +553,7 @@ places_cfg_open_dialog(PlacesCfg *cfg)
G_OBJECT (vbox_recent), "sensitive");
frame_recent = xfce_gtk_frame_box_new_with_content(_("Recent Documents"), vbox_recent);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_recent, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dlg))), frame_recent, FALSE, FALSE, 0);
/* RECENT DOCUMENTS: Show clear option */
tmp_widget = gtk_check_button_new_with_mnemonic(_("Show cl_ear option"));
@@ -564,7 +564,7 @@ places_cfg_open_dialog(PlacesCfg *cfg)
gtk_box_pack_start(GTK_BOX(vbox_recent), tmp_widget, FALSE, FALSE, 0);
/* RECENT DOCUMENTS: Number to display */
- tmp_box = gtk_hbox_new(FALSE, 15);
+ tmp_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 15);
gtk_widget_show(tmp_box);
gtk_box_pack_start(GTK_BOX(vbox_recent), tmp_box, FALSE, FALSE, 0);
@@ -574,7 +574,7 @@ places_cfg_open_dialog(PlacesCfg *cfg)
adj = gtk_adjustment_new(cfg->show_recent_number, 1, 25, 1, 5, 0);
- tmp_widget = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0);
+ tmp_widget = gtk_spin_button_new(adj, 1, 0);
gtk_label_set_mnemonic_widget(GTK_LABEL(tmp_label), tmp_widget);
exo_mutual_binding_new (G_OBJECT (cfg), "show-recent-number",
@@ -585,14 +585,14 @@ places_cfg_open_dialog(PlacesCfg *cfg)
#endif
/* Search: frame, vbox */
- vbox_search = gtk_vbox_new(FALSE, 4);
+ vbox_search = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show(vbox_search);
frame_search = xfce_gtk_frame_box_new_with_content(_("Search"), vbox_search);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame_search, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG(dlg))), frame_search, FALSE, FALSE, 0);
/* Search: command */
- tmp_box = gtk_hbox_new(FALSE, 15);
+ tmp_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 15);
gtk_widget_show(tmp_box);
gtk_box_pack_start(GTK_BOX(vbox_search), tmp_box, FALSE, FALSE, 0);
diff --git a/panel-plugin/view.c b/panel-plugin/view.c
index 8984ed2..82c81e0 100644
--- a/panel-plugin/view.c
+++ b/panel-plugin/view.c
@@ -230,7 +230,7 @@ pview_cb_menu_timeout(PlacesView *pd){
if(!pd->menu_timeout_id)
goto killtimeout;
- if(pd->menu == NULL || !GTK_WIDGET_VISIBLE(pd->menu))
+ if(pd->menu == NULL || !gtk_widget_is_visible(pd->menu))
goto killtimeout;
if(pview_model_changed(pd->bookmark_groups))
@@ -870,7 +870,7 @@ pview_remote_event(XfcePanelPlugin *panel_plugin,
DBG("remote event: %s, %x", name, (guint) view);
if (strcmp (name, "popup") == 0
- && GTK_WIDGET_VISIBLE (panel_plugin)
+ && gtk_widget_is_visible (GTK_WIDGET (panel_plugin))
&& !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->button))
&& pview_grab_available ()) /* checking if there is another menu on the screen */
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list