Fix incompatible pointer types

mate-desktop · Feb 2, 2019 · 4e42def · 4e42def
1 parent e99050a
commit 4e42def
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
@@ -192,7 +192,7 @@ caja_action_from_menu_item (CajaMenuItem *item,
         {
             g_object_set_data_full (G_OBJECT (action), "menu-icon",
                                     surface,
-                                    cairo_surface_destroy);
+                                    (GDestroyNotify)cairo_surface_destroy);
         }
     }
 
@@ -241,7 +241,7 @@ caja_toolbar_action_from_menu_item (CajaMenuItem *item, GtkWidget *parent_widget
         {
             g_object_set_data_full (G_OBJECT (action), "toolbar-icon",
                                     surface,
-                                    cairo_surface_destroy);
+                                    (GDestroyNotify)cairo_surface_destroy);
         }
     }
 

diff --git a/src/caja-bookmark-list.c b/src/caja-bookmark-list.c
@@ -212,7 +212,7 @@ do_constructor (GType type,
 
     if (singleton != NULL)
     {
-        return g_object_ref (singleton);
+        return g_object_ref (G_OBJECT (singleton));
     }
 
     retval = G_OBJECT_CLASS (caja_bookmark_list_parent_class)->constructor

diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
@@ -197,7 +197,7 @@ caja_menus_append_bookmark_to_menu (CajaWindow *window,
 
     g_object_set_data_full (G_OBJECT (action), "menu-icon",
                             cairo_surface_reference (surface),
-                            cairo_surface_destroy);
+                            (GDestroyNotify)cairo_surface_destroy);
 
     g_signal_connect_data (action, "activate",
                            G_CALLBACK (activate_bookmark_in_menu_item),

diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
@@ -4441,7 +4441,7 @@ add_submenu (GtkUIManager *ui_manager,
 			if (surface != NULL) {
 				g_object_set_data_full (G_OBJECT (action), "menu-icon",
 							cairo_surface_reference (surface),
-							cairo_surface_destroy);
+							(GDestroyNotify)cairo_surface_destroy);
 			}
 
 			g_object_set (action, "hide-if-empty", FALSE, NULL);
@@ -4984,7 +4984,7 @@ add_extension_action_for_files (FMDirectoryView *view,
 		if (surface != NULL) {
 			g_object_set_data_full (G_OBJECT (action), "menu-icon",
 						surface,
-						cairo_surface_destroy);
+						(GDestroyNotify)cairo_surface_destroy);
 		}
 	}
 
@@ -5451,7 +5451,7 @@ add_script_to_scripts_menus (FMDirectoryView *directory_view,
 	if (surface != NULL) {
 		g_object_set_data_full (G_OBJECT (action), "menu-icon",
 					surface,
-					cairo_surface_destroy);
+					(GDestroyNotify)cairo_surface_destroy);
 	}
 
 	g_signal_connect_data (action, "activate",
@@ -5702,7 +5702,7 @@ add_template_to_templates_menus (FMDirectoryView *directory_view,
 	if (surface != NULL) {
 		g_object_set_data_full (G_OBJECT (action), "menu-icon",
 					surface,
-					cairo_surface_destroy);
+					(GDestroyNotify)cairo_surface_destroy);
 	}
 
 	g_signal_connect_data (action, "activate",