[Xfce4-commits] [xfce/exo] 01/01: Fix various compiler warnings

[noreply at xfce.org]

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 xfce/exo.

commit b005284f6f31338f42300d8af45b8b4a7c68d15a
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Jun 5 22:20:41 2018 -0400

    Fix various compiler warnings
---
 exo-desktop-item-edit/exo-die-utils.c | 6 +++---
 exo-helper/exo-helper-chooser.c       | 2 +-
 exo/exo-gdk-pixbuf-extensions.c       | 2 +-
 exo/exo-icon-chooser-model.c          | 2 +-
 exo/exo-icon-view.c                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/exo-desktop-item-edit/exo-die-utils.c b/exo-desktop-item-edit/exo-die-utils.c
index 274bd97..7016ca1 100644
--- a/exo-desktop-item-edit/exo-die-utils.c
+++ b/exo-desktop-item-edit/exo-die-utils.c
@@ -121,14 +121,14 @@ exo_die_g_key_file_save (GKeyFile          *key_file,
       g_free (name);
       if (desktop_suffix)
         {
-          file = g_object_ref (G_OBJECT (base));
+          file = G_FILE (g_object_ref (G_OBJECT (base)));
         }
       else
         {
           file_type = g_file_query_file_type (base, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL);
           if (file_type == G_FILE_TYPE_REGULAR)
             {
-              file = g_object_ref (G_OBJECT (base));
+              file = G_FILE (g_object_ref (G_OBJECT (base)));
             }
           else if (file_type == G_FILE_TYPE_DIRECTORY)
             {
@@ -176,7 +176,7 @@ exo_die_g_key_file_save (GKeyFile          *key_file,
   else
     {
       /* base is the file */
-      file = g_object_ref (G_OBJECT (base));
+      file = G_FILE (g_object_ref (G_OBJECT (base)));
     }
 
   /* determine the data for the key file */
diff --git a/exo-helper/exo-helper-chooser.c b/exo-helper/exo-helper-chooser.c
index 1f339d0..dde68cc 100644
--- a/exo-helper/exo-helper-chooser.c
+++ b/exo-helper/exo-helper-chooser.c
@@ -685,7 +685,7 @@ exo_helper_chooser_pressed (ExoHelperChooser *chooser,
       cursor = gdk_cursor_new_for_display (gdk_window_get_display (gtk_widget_get_window (button)), GDK_WATCH);
       gdk_window_set_cursor (gtk_widget_get_window (button), cursor);
       g_object_unref (cursor);
-      gdk_flush ();
+      gdk_display_flush (gdk_display_get_default ());
     }
 
   /* allocate a new menu */
diff --git a/exo/exo-gdk-pixbuf-extensions.c b/exo/exo-gdk-pixbuf-extensions.c
index 40d3e66..b58645e 100644
--- a/exo/exo-gdk-pixbuf-extensions.c
+++ b/exo/exo-gdk-pixbuf-extensions.c
@@ -596,7 +596,7 @@ exo_gdk_pixbuf_scale_down (GdkPixbuf *source,
 
   /* check if we need to scale */
   if (G_UNLIKELY (source_width <= dest_width && source_height <= dest_height))
-    return g_object_ref (G_OBJECT (source));
+    return GDK_PIXBUF (g_object_ref (G_OBJECT (source)));
 
   /* check if aspect ratio should be preserved */
   if (G_LIKELY (preserve_aspect_ratio))
diff --git a/exo/exo-icon-chooser-model.c b/exo/exo-icon-chooser-model.c
index 189f6ce..6046db3 100644
--- a/exo/exo-icon-chooser-model.c
+++ b/exo/exo-icon-chooser-model.c
@@ -678,7 +678,7 @@ _exo_icon_chooser_model_get_for_icon_theme (GtkIconTheme *icon_theme)
       g_object_set_data (G_OBJECT (icon_theme), "exo-icon-chooser-default-model", model);
 
       /* associated the model with the icon theme */
-      model->icon_theme = g_object_ref (G_OBJECT (icon_theme));
+      model->icon_theme = GTK_ICON_THEME (g_object_ref (G_OBJECT (icon_theme)));
       exo_icon_chooser_model_icon_theme_changed (icon_theme, model);
       g_signal_connect (G_OBJECT (icon_theme), "changed", G_CALLBACK (exo_icon_chooser_model_icon_theme_changed), model);
     }
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index ac91177..458e699 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -2952,7 +2952,7 @@ exo_icon_view_key_press_event (GtkWidget   *widget,
   /* allocate a new event to forward */
   new_event = gdk_event_copy ((GdkEvent *) event);
   g_object_unref (G_OBJECT (new_event->key.window));
-  new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)));
+  new_event->key.window = GDK_WINDOW (g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry))));
 
   /* send the event to the search entry. If the "preedit-changed" signal is
    * emitted during this event, priv->search_imcontext_changed will be set.

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