summaryrefslogtreecommitdiff
path: root/src/caja-application.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-23 11:58:30 +0200
committerJasmine Hassan <[email protected]>2012-11-23 11:58:30 +0200
commitae06676815e24a27549e0c79a74bc81c77822554 (patch)
treecde88ea4e11a2f0809da857feaefa6824d4ba8fa /src/caja-application.c
parentb00cccb74307a49df74deb785936e3cd9cf3a5ad (diff)
downloadcaja-ae06676815e24a27549e0c79a74bc81c77822554.tar.bz2
caja-ae06676815e24a27549e0c79a74bc81c77822554.tar.xz
[src] fix some incompatible pointer type warnings
including a silly mistake in caja-window where destroy function's return type was accidently ommitted during the addition of gtk version checks.
Diffstat (limited to 'src/caja-application.c')
-rw-r--r--src/caja-application.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/caja-application.c b/src/caja-application.c
index 6c68198f..47a956c4 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -434,7 +434,11 @@ check_required_directories (CajaApplication *application)
dialog = eel_show_error_dialog (error_string, detail_string, NULL);
/* We need the main event loop so the user has a chance to see the dialog. */
+#if GTK_CHECK_VERSION (3, 0, 0)
caja_main_event_loop_register (GTK_WIDGET (dialog));
+#else
+ caja_main_event_loop_register (GTK_OBJECT (dialog));
+#endif
g_string_free (directories_as_string, TRUE);
g_free (error_string);
@@ -1171,7 +1175,7 @@ caja_application_close_desktop (void)
{
if (caja_application_desktop_windows != NULL)
{
- g_list_free_full (caja_application_desktop_windows, gtk_widget_destroy);
+ g_list_free_full (caja_application_desktop_windows, (GDestroyNotify) gtk_widget_destroy);
caja_application_desktop_windows = NULL;
}
}