GNOME.org
 

[goobox] removed some deprecated functions

commit 2dd4c0d57da9f97668f2e9d966fa0bd612827401
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Dec 28 14:12:44 2018 +0100

    removed some deprecated functions

 src/dlg-properties.c           |  1 -
 src/dlg-ripper.c               |  2 +-
 src/goo-player-bar.c           |  6 ++++--
 src/goo-player-info.c          | 16 ++++++++++------
 src/goo-window.c               | 19 ++++++-------------
 src/gtk-file-chooser-preview.c |  6 ++++--
 src/gtk-utils.c                |  2 +-
 7 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/src/dlg-properties.c b/src/dlg-properties.c
index 5e84180..d496708 100644
--- a/src/dlg-properties.c
+++ b/src/dlg-properties.c
@@ -437,7 +437,6 @@ artist_combobox_changed_cb (GtkComboBox *widget,
 {
        gboolean single_artist = gtk_combo_box_get_active (widget) == 0;
        gtk_tree_view_column_set_visible (data->author_column, ! single_artist);
-       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (GET_WIDGET ("track_treeview")), ! single_artist);
        if (single_artist)
                gtk_widget_show (GET_WIDGET ("artist_entry"));
        else
diff --git a/src/dlg-ripper.c b/src/dlg-ripper.c
index 34f1883..e9ff66d 100644
--- a/src/dlg-ripper.c
+++ b/src/dlg-ripper.c
@@ -462,7 +462,7 @@ done_dialog_response_cb (GtkDialog  *dialog,
                        char *uri;
 
                        uri = g_file_get_uri (folder);
-                       if (! gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)), uri, 
GDK_CURRENT_TIME, &error))
+                       if (! gtk_show_uri_on_window (GTK_WINDOW (dialog), uri, GDK_CURRENT_TIME, &error))
                                _gtk_error_dialog_from_gerror_run (GTK_WINDOW (data->window), _("Could not 
display the destination folder"), &error);
 
                        g_free (uri);
diff --git a/src/goo-player-bar.c b/src/goo-player-bar.c
index e885d97..1ad0a32 100644
--- a/src/goo-player-bar.c
+++ b/src/goo-player-bar.c
@@ -260,7 +260,8 @@ goo_player_bar_construct (GooPlayerBar      *self,
        gtk_box_pack_start (GTK_BOX (main_box), self->priv->time_box, TRUE, FALSE, 0);
 
        self->priv->current_time_label = gtk_label_new (NULL);
-       gtk_misc_set_alignment (GTK_MISC (self->priv->current_time_label), 1.0, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (self->priv->current_time_label), 1.0);
+       gtk_label_set_yalign (GTK_LABEL (self->priv->current_time_label), 0.5);
        gtk_label_set_width_chars (GTK_LABEL (self->priv->current_time_label), TIME_LABEL_WIDTH_IN_CHARS);
 
        self->priv->time_scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.0, 1.0, 0.01);
@@ -270,7 +271,8 @@ goo_player_bar_construct (GooPlayerBar      *self,
        gtk_widget_show (self->priv->time_scale);
 
        self->priv->remaining_time_label = gtk_label_new (NULL);
-       gtk_misc_set_alignment (GTK_MISC (self->priv->remaining_time_label), 0.0, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (self->priv->remaining_time_label), 0.0);
+       gtk_label_set_yalign (GTK_LABEL (self->priv->remaining_time_label), 0.5);
        gtk_label_set_width_chars (GTK_LABEL (self->priv->remaining_time_label), TIME_LABEL_WIDTH_IN_CHARS);
 
        gtk_box_pack_start (GTK_BOX (self->priv->time_box), self->priv->current_time_label, FALSE, FALSE, 0);
diff --git a/src/goo-player-info.c b/src/goo-player-info.c
index 5a7fc54..2a701bb 100644
--- a/src/goo-player-info.c
+++ b/src/goo-player-info.c
@@ -206,9 +206,9 @@ goo_player_info_construct (GooPlayerInfo *info)
        priv->update_id = 0;
 
        gtk_widget_set_margin_top (GTK_WIDGET (info), 10);
-       gtk_widget_set_margin_right (GTK_WIDGET (info), 10);
+       gtk_widget_set_margin_end (GTK_WIDGET (info), 10);
        gtk_widget_set_margin_bottom (GTK_WIDGET (info), 10);
-       gtk_widget_set_margin_left (GTK_WIDGET (info), 10);
+       gtk_widget_set_margin_start (GTK_WIDGET (info), 10);
 
        gtk_widget_set_can_focus (GTK_WIDGET (info), FALSE);
        gtk_box_set_spacing (GTK_BOX (info), 12);
@@ -218,21 +218,25 @@ goo_player_info_construct (GooPlayerInfo *info)
 
        priv->title1_label = gtk_label_new (NULL);
        gtk_style_context_add_class (gtk_widget_get_style_context (priv->title1_label), "goobox-info-album");
-       gtk_misc_set_alignment (GTK_MISC (priv->title1_label), 0.0, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (priv->title1_label), 0.0);
+       gtk_label_set_yalign (GTK_LABEL (priv->title1_label), 0.5);
 
        priv->title2_label = gtk_label_new (NULL);
        gtk_style_context_add_class (gtk_widget_get_style_context (priv->title2_label), "goobox-info-artist");
-       gtk_misc_set_alignment (GTK_MISC (priv->title2_label), 0.0, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (priv->title2_label), 0.0);
+       gtk_label_set_yalign (GTK_LABEL (priv->title2_label), 0.5);
        gtk_label_set_selectable (GTK_LABEL (priv->title2_label), TRUE);
 
        priv->title3_label = gtk_label_new (NULL);
        gtk_style_context_add_class (gtk_widget_get_style_context (priv->title3_label), "goobox-info-track");
-       gtk_misc_set_alignment (GTK_MISC (priv->title3_label), 0.0, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (priv->title3_label), 0.0);
+       gtk_label_set_yalign (GTK_LABEL (priv->title3_label), 0.5);
        gtk_label_set_selectable (GTK_LABEL (priv->title3_label), TRUE);
 
        priv->time_label = gtk_label_new (NULL);
        gtk_style_context_add_class (gtk_widget_get_style_context (priv->time_label), "goobox-info-time");
-       gtk_misc_set_alignment (GTK_MISC (priv->time_label), 0.0, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (priv->time_label), 0.0);
+       gtk_label_set_yalign (GTK_LABEL (priv->time_label), 0.5);
        gtk_label_set_selectable (GTK_LABEL (priv->time_label), TRUE);
 
        gtk_label_set_ellipsize (GTK_LABEL (priv->title1_label), PANGO_ELLIPSIZE_END);
diff --git a/src/goo-window.c b/src/goo-window.c
index c4550ca..138cae6 100644
--- a/src/goo-window.c
+++ b/src/goo-window.c
@@ -1676,11 +1676,7 @@ file_button_press_cb (GtkWidget      *widget,
                else
                        gtk_tree_selection_unselect_all (selection);
 
-               gtk_menu_popup (GTK_MENU (window->priv->file_popup_menu),
-                               NULL, NULL, NULL,
-                               window,
-                               event->button,
-                               event->time);
+               gtk_menu_popup_at_pointer (GTK_MENU (window->priv->file_popup_menu), (GdkEvent *) event);
                return TRUE;
        }
        else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 1)) {
@@ -1766,7 +1762,6 @@ update_ui_from_expander_state (GooWindow *window)
                gtk_window_resize (GTK_WINDOW (window),
                                   g_settings_get_int (window->priv->settings_ui, PREF_UI_WINDOW_WIDTH),
                                   g_settings_get_int (window->priv->settings_ui, PREF_UI_WINDOW_HEIGHT));
-       gtk_window_set_has_resize_grip (GTK_WINDOW (window), TRUE);
 
        hints.max_height = window->priv->resizable_playlist ? G_MAXINT : -1;
        hints.max_width = G_MAXINT;
@@ -1792,12 +1787,11 @@ player_info_cover_clicked_cb (GooPlayerInfo *info,
                              GooWindow     *window)
 {
        debug (DEBUG_INFO, "[Window] cover clicked\n");
-
-       gtk_menu_popup (GTK_MENU (window->priv->cover_popup_menu),
-                       NULL, NULL, NULL,
-                       window,
-                       3,
-                       GDK_CURRENT_TIME);
+       gtk_menu_popup_at_widget (GTK_MENU (window->priv->cover_popup_menu),
+                                 GTK_WIDGET (info),
+                                 GDK_GRAVITY_SOUTH_WEST,
+                                 GDK_GRAVITY_NORTH_WEST,
+                                 NULL);
 }
 
 
@@ -2139,7 +2133,6 @@ goo_window_construct (GooWindow    *window,
                                                       G_TYPE_STRING);
        window->priv->list_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (window->priv->list_store));
 
-       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (window->priv->list_view), TRUE);
        add_columns (window, GTK_TREE_VIEW (window->priv->list_view));
        gtk_tree_view_set_enable_search (GTK_TREE_VIEW (window->priv->list_view), TRUE);
        gtk_tree_view_set_search_column (GTK_TREE_VIEW (window->priv->list_view), COLUMN_TITLE);
diff --git a/src/gtk-file-chooser-preview.c b/src/gtk-file-chooser-preview.c
index d106b2b..81f3c3b 100644
--- a/src/gtk-file-chooser-preview.c
+++ b/src/gtk-file-chooser-preview.c
@@ -164,7 +164,8 @@ gtk_file_chooser_preview_construct (GtkFileChooserPreview  *preview)
 
        label = gtk_label_new_with_mnemonic (_("Preview"));
        gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+       gtk_label_set_yalign (GTK_LABEL (label), 0.5);
        gtk_container_add (GTK_CONTAINER (button), label);
        gtk_widget_show (label);
 
@@ -191,7 +192,8 @@ gtk_file_chooser_preview_construct (GtkFileChooserPreview  *preview)
 
        preview->priv->image_info = gtk_label_new (NULL);
        gtk_label_set_justify (GTK_LABEL (preview->priv->image_info), GTK_JUSTIFY_CENTER);
-       gtk_misc_set_alignment (GTK_MISC (preview->priv->image_info), 0.5, 0.5);
+       gtk_label_set_xalign (GTK_LABEL (preview->priv->image_info), 0.5);
+       gtk_label_set_yalign (GTK_LABEL (preview->priv->image_info), 0.5);
        gtk_widget_hide (preview->priv->image_info);
        gtk_box_pack_start (GTK_BOX (vbox2), preview->priv->image_info, FALSE, FALSE, 0);
 
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index b0d0bd2..dab7fe9 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -491,7 +491,7 @@ show_help_dialog (GtkWindow  *parent,
        GError *error = NULL;
 
        uri = g_strconcat ("help:goobox", section ? "?" : NULL, section, NULL);
-       if (! gtk_show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
+       if (! gtk_show_uri_on_window (parent, uri, GDK_CURRENT_TIME, &error)) {
                GtkWidget *dialog;
 
                dialog = _gtk_message_dialog_new (parent,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]