diff options
| author | Victor Kareh <[email protected]> | 2019-02-01 07:07:24 -0500 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2019-02-02 00:14:51 +0000 |
| commit | 4e42def6ff1c846d54e93260d116dc69eac97d2f (patch) | |
| tree | 4712f41d15ab7f0a9305aa6f0505616f6795a2ed | |
| parent | e99050ad48b89cb8e1a5eaafbb9fdf2ffd418485 (diff) | |
| download | caja-4e42def6ff1c846d54e93260d116dc69eac97d2f.tar.bz2 caja-4e42def6ff1c846d54e93260d116dc69eac97d2f.tar.xz | |
Fix incompatible pointer types
| -rw-r--r-- | libcaja-private/caja-ui-utilities.c | 4 | ||||
| -rw-r--r-- | src/caja-bookmark-list.c | 2 | ||||
| -rw-r--r-- | src/caja-window-menus.c | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c index 3ae1225b..1cdb5125 100644 --- 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 index d39b2b98..a8a2adb2 100644 --- 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 index d96df926..3e7b208c 100644 --- 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 index 7105036a..3c61e5a6 100644 --- 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", |