Skip to content

Commit

Permalink
Fix incompatible pointer types
Browse files Browse the repository at this point in the history
  • Loading branch information
vkareh authored and lukefromdc committed Feb 2, 2019
1 parent e99050a commit 4e42def
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions libcaja-private/caja-ui-utilities.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/caja-bookmark-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/caja-window-menus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions src/file-manager/fm-directory-view.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 4e42def

Please sign in to comment.