Fix incompatible pointer types

vkareh · lukefromdc · commit 4e42def6ff1c · 2019-02-02T00:14:51.000Z
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",

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ caja_action_from_menu_item (CajaMenuItem *item,`
`192`	`192`	`{`
`193`	`193`	`g_object_set_data_full (G_OBJECT (action), "menu-icon",`
`194`	`194`	`surface,`
`195`		`- cairo_surface_destroy);`
	`195`	`+ (GDestroyNotify)cairo_surface_destroy);`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`@@ -241,7 +241,7 @@ caja_toolbar_action_from_menu_item (CajaMenuItem item, GtkWidget parent_widget`
`241`	`241`	`{`
`242`	`242`	`g_object_set_data_full (G_OBJECT (action), "toolbar-icon",`
`243`	`243`	`surface,`
`244`		`- cairo_surface_destroy);`
	`244`	`+ (GDestroyNotify)cairo_surface_destroy);`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ do_constructor (GType type,`
`212`	`212`
`213`	`213`	`if (singleton != NULL)`
`214`	`214`	`{`
`215`		`- return g_object_ref (singleton);`
	`215`	`+ return g_object_ref (G_OBJECT (singleton));`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`retval = G_OBJECT_CLASS (caja_bookmark_list_parent_class)->constructor`
Original file line number	Diff line number	Diff line change
`@@ -4441,7 +4441,7 @@ add_submenu (GtkUIManager *ui_manager,`
`4441`	`4441`	`if (surface != NULL) {`
`4442`	`4442`	`g_object_set_data_full (G_OBJECT (action), "menu-icon",`
`4443`	`4443`	`cairo_surface_reference (surface),`
`4444`		`- cairo_surface_destroy);`
	`4444`	`+ (GDestroyNotify)cairo_surface_destroy);`
`4445`	`4445`	`}`
`4446`	`4446`
`4447`	`4447`	`g_object_set (action, "hide-if-empty", FALSE, NULL);`
`@@ -4984,7 +4984,7 @@ add_extension_action_for_files (FMDirectoryView *view,`
`4984`	`4984`	`if (surface != NULL) {`
`4985`	`4985`	`g_object_set_data_full (G_OBJECT (action), "menu-icon",`
`4986`	`4986`	`surface,`
`4987`		`- cairo_surface_destroy);`
	`4987`	`+ (GDestroyNotify)cairo_surface_destroy);`
`4988`	`4988`	`}`
`4989`	`4989`	`}`
`4990`	`4990`
`@@ -5451,7 +5451,7 @@ add_script_to_scripts_menus (FMDirectoryView *directory_view,`
`5451`	`5451`	`if (surface != NULL) {`
`5452`	`5452`	`g_object_set_data_full (G_OBJECT (action), "menu-icon",`
`5453`	`5453`	`surface,`
`5454`		`- cairo_surface_destroy);`
	`5454`	`+ (GDestroyNotify)cairo_surface_destroy);`
`5455`	`5455`	`}`
`5456`	`5456`
`5457`	`5457`	`g_signal_connect_data (action, "activate",`
`@@ -5702,7 +5702,7 @@ add_template_to_templates_menus (FMDirectoryView *directory_view,`
`5702`	`5702`	`if (surface != NULL) {`
`5703`	`5703`	`g_object_set_data_full (G_OBJECT (action), "menu-icon",`
`5704`	`5704`	`surface,`
`5705`		`- cairo_surface_destroy);`
	`5705`	`+ (GDestroyNotify)cairo_surface_destroy);`
`5706`	`5706`	`}`
`5707`	`5707`
`5708`	`5708`	`g_signal_connect_data (action, "activate",`