diff options
| author | Rahul Verma <rv404674@gmail.com> | 2018-01-12 14:25:24 +0530 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-03-24 20:17:39 +0200 |
| commit | 9c6f5c30bcff77460abfcc147d91ca739110ed82 (patch) | |
| tree | 00602a731357e0ffa47065da7f02a48c78846207 | |
| parent | dc97cf3201dc30f51c853ebf8bcae553c74f90da (diff) | |
| download | nautilus-9c6f5c30bcff77460abfcc147d91ca739110ed82.tar.gz | |
general: Fix-Wincompatible-pointer-types warnings
We were having an issue where we were not casting objects properly.
https://blogs.gnome.org/chergert/2018/01/05/g_object_ref-and-wincompatible-pointer-types/
The solution is to type cast explicitly to the correct type.
close #192
| -rw-r--r-- | src/nautilus-file.c | 2 | ||||
| -rw-r--r-- | src/nautilus-files-view.c | 4 | ||||
| -rw-r--r-- | src/nautilus-progress-info-manager.c | 2 | ||||
| -rw-r--r-- | src/nautilus-properties-window.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/nautilus-file.c b/src/nautilus-file.c index 6cbeddd13..d6ac35a44 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -5461,7 +5461,7 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file, if (pixbuf != NULL) { - gicon = g_object_ref (pixbuf); + gicon = G_ICON (g_object_ref (pixbuf)); } else if (file->details->is_thumbnailing) { diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 4f58d4239..dc1ac5e20 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -9547,8 +9547,8 @@ nautilus_files_view_init (NautilusFilesView *view) builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-toolbar-view-menu.ui"); priv->toolbar_menu_sections = g_new0 (NautilusToolbarMenuSections, 1); priv->toolbar_menu_sections->supports_undo_redo = TRUE; - priv->toolbar_menu_sections->zoom_section = g_object_ref_sink (gtk_builder_get_object (builder, "zoom_section")); - priv->toolbar_menu_sections->extended_section = g_object_ref_sink (gtk_builder_get_object (builder, "extended_section")); + priv->toolbar_menu_sections->zoom_section = GTK_WIDGET (g_object_ref_sink (gtk_builder_get_object (builder, "zoom_section"))); + priv->toolbar_menu_sections->extended_section = GTK_WIDGET (g_object_ref_sink (gtk_builder_get_object (builder, "extended_section"))); priv->zoom_controls_box = GTK_WIDGET (gtk_builder_get_object (builder, "zoom_controls_box")); priv->zoom_level_label = GTK_WIDGET (gtk_builder_get_object (builder, "zoom_level_label")); diff --git a/src/nautilus-progress-info-manager.c b/src/nautilus-progress-info-manager.c index 57950a136..00868593a 100644 --- a/src/nautilus-progress-info-manager.c +++ b/src/nautilus-progress-info-manager.c @@ -78,7 +78,7 @@ nautilus_progress_info_manager_constructor (GType type, if (singleton != NULL) { - return g_object_ref (singleton); + return G_OBJECT (g_object_ref (singleton)); } retval = G_OBJECT_CLASS (nautilus_progress_info_manager_parent_class)->constructor diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c index 40ad2554d..d9ccd229a 100644 --- a/src/nautilus-properties-window.c +++ b/src/nautilus-properties-window.c @@ -1600,7 +1600,7 @@ schedule_group_change (NautilusPropertiesWindow *window, change->file = nautilus_file_ref (file); change->group = g_strdup (group); - change->window = g_object_ref (G_OBJECT (window)); + change->window = GTK_WINDOW (g_object_ref (window)); change->timeout = g_timeout_add (CHOWN_CHGRP_TIMEOUT, (GSourceFunc) schedule_group_change_timeout, @@ -2021,7 +2021,7 @@ schedule_owner_change (NautilusPropertiesWindow *window, change->file = nautilus_file_ref (file); change->owner = g_strdup (owner); - change->window = g_object_ref (G_OBJECT (window)); + change->window = GTK_WINDOW (g_object_ref (window)); change->timeout = g_timeout_add (CHOWN_CHGRP_TIMEOUT, (GSourceFunc) schedule_owner_change_timeout, |