diff --git a/ChangeLog b/ChangeLog
index 752d4efab9f2915e14ca8d8c15745814bc8efc87..160dbe7715a6736c2451656614b3f4d337d46068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-08-09 Benedikt Meurer <benny@xfce.org>
+
+ * thunar-vfs/thunar-vfs-exec.c(tvsn_get_active_workspace_number),
+ configure.in.in: Enable compilation with -fstrict-aliasing without
+ breaking the strict aliasing rules of the compiler.
+ * configure.in.in: Enable compilation with --enable-debug=yes or
+ --enable-debug=full and compilers other than gcc.
+ * configure.in.in, thunar/thunar-private.h, thunar/thunar-*.c:
+ Disable extra debugging in release builds, Thunar received
+ quite a lot of stabilization now. This affects only the internals
+ of the binary. The public API is still fully sanity checked.
+ * thunar/thunar-column-model.c, thunar/thunar-renamer-model.c,
+ thunar/thunar-shortcuts-model.c, thunar/thunar-tree-model.c:
+ Remove unused variables when building with --enable-debug=no or
+ --enable-debug=minimum now.
+
2006-08-09 Benedikt Meurer <benny@xfce.org>
* thunar/thunar-details-view.c(thunar_details_view_init): Enable
diff --git a/configure.in.in b/configure.in.in
index df2b94f26ee10d324079899d4be0fc88f6514c98..dc2d3d1836324de51c0cbb30299ac74e34035e1e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -255,29 +255,42 @@ AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging
[], [enable_debug=thunar_debug_default])
AC_MSG_CHECKING([whether to enable debugging support])
if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
- dnl Check whether the compiler accepts the -fno-strict-aliasing
- dnl switch, as certain packages - like Glib - still don't work
- dnl properly with newer compilers.
+ dnl Print the result
+ AC_MSG_RESULT([$enable_debug])
+
+ dnl Make sure we detect possible errors (if supported)
save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -fno-strict-aliasing"
- AC_MSG_CHECKING([whether $CC accepts -fno-strict-aliasing])
+ CFLAGS="$CFLAGS -Wall -Werror"
+ AC_MSG_CHECKING([whether $CC accepts -Wall -Werror])
AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
AC_MSG_RESULT([yes])
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fno-strict-aliasing"
+ PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Wall -Werror"
], [
AC_MSG_RESULT([no])
])
CFLAGS="$save_CFLAGS"
- dnl Make sure we detect possible errors
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror -Wall"
+ dnl Enable extensive debugging
+ PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
dnl Paranoia for --enable-debug=full
if test x"$enable_debug" = x"full"; then
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
+ dnl Use -O0 -g3 if the compiler supports it
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -O0 -g3"
+ AC_MSG_CHECKING([whether $CC accepts -O0 -g3])
+ AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
+ AC_MSG_RESULT([yes])
+ PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
+ ], [
+ AC_MSG_RESULT([no])
+ ])
+ CFLAGS="$save_CFLAGS"
fi
else
+ dnl Print the result
+ AC_MSG_RESULT([$enable_debug])
+
dnl Disable object cast checks
PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
@@ -286,7 +299,6 @@ else
PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
fi
fi
-AC_MSG_RESULT([$enable_debug])
dnl **************************************
dnl *** Check for linker optimizations ***
diff --git a/thunar-vfs/thunar-vfs-exec.c b/thunar-vfs/thunar-vfs-exec.c
index 12dbcd6605241d2e994db77d070ad6fc4fd2c39b..f7d065c0f41be247fa0451765a36a1375a8913e1 100644
--- a/thunar-vfs/thunar-vfs-exec.c
+++ b/thunar-vfs/thunar-vfs-exec.c
@@ -327,12 +327,12 @@ tvsn_get_active_workspace_number (GdkScreen *screen)
if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), GDK_WINDOW_XWINDOW (root),
_NET_CURRENT_DESKTOP, 0, 32, False, XA_CARDINAL,
&type_ret, &format_ret, &nitems_ret, &bytes_after_ret,
- (unsigned char **) &prop_ret) != Success)
+ (gpointer) &prop_ret) != Success)
{
if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (root), GDK_WINDOW_XWINDOW (root),
_WIN_WORKSPACE, 0, 32, False, XA_CARDINAL,
&type_ret, &format_ret, &nitems_ret, &bytes_after_ret,
- (unsigned char **) &prop_ret) != Success)
+ (gpointer) &prop_ret) != Success)
{
if (G_UNLIKELY (prop_ret != NULL))
{
diff --git a/thunar/thunar-abstract-icon-view.c b/thunar/thunar-abstract-icon-view.c
index 7202620e922b3a952ff7cc91c65a2a891d572894..6a396fc16b645bc4293e3df72147d18820867a24 100644
--- a/thunar/thunar-abstract-icon-view.c
+++ b/thunar/thunar-abstract-icon-view.c
@@ -23,10 +23,11 @@
#include <gdk/gdkkeysyms.h>
-#include <thunar/thunar-gobject-extensions.h>
-#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-abstract-icon-view.h>
#include <thunar/thunar-abstract-icon-view-ui.h>
+#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-gtk-extensions.h>
+#include <thunar/thunar-private.h>
@@ -336,7 +337,7 @@ thunar_abstract_icon_view_get_selected_items (ThunarStandardView *standard_view)
static void
thunar_abstract_icon_view_select_all (ThunarStandardView *standard_view)
{
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
exo_icon_view_select_all (EXO_ICON_VIEW (GTK_BIN (standard_view)->child));
}
@@ -345,7 +346,7 @@ thunar_abstract_icon_view_select_all (ThunarStandardView *standard_view)
static void
thunar_abstract_icon_view_unselect_all (ThunarStandardView *standard_view)
{
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
exo_icon_view_unselect_all (EXO_ICON_VIEW (GTK_BIN (standard_view)->child));
}
@@ -355,7 +356,7 @@ static void
thunar_abstract_icon_view_select_path (ThunarStandardView *standard_view,
GtkTreePath *path)
{
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
exo_icon_view_select_path (EXO_ICON_VIEW (GTK_BIN (standard_view)->child), path);
}
@@ -368,7 +369,7 @@ thunar_abstract_icon_view_set_cursor (ThunarStandardView *standard_view,
{
GtkCellRendererMode mode;
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
/* make sure the name renderer is editable */
mode = standard_view->name_renderer->mode;
@@ -390,7 +391,7 @@ thunar_abstract_icon_view_scroll_to_path (ThunarStandardView *standard_view,
gfloat row_align,
gfloat col_align)
{
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
exo_icon_view_scroll_to_path (EXO_ICON_VIEW (GTK_BIN (standard_view)->child), path, use_align, row_align, col_align);
}
@@ -401,7 +402,7 @@ thunar_abstract_icon_view_get_path_at_pos (ThunarStandardView *standard_view,
gint x,
gint y)
{
- g_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view), NULL);
return exo_icon_view_get_path_at_pos (EXO_ICON_VIEW (GTK_BIN (standard_view)->child), x, y);
}
@@ -412,7 +413,7 @@ thunar_abstract_icon_view_get_visible_range (ThunarStandardView *standard_view,
GtkTreePath **start_path,
GtkTreePath **end_path)
{
- g_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view), FALSE);
return exo_icon_view_get_visible_range (EXO_ICON_VIEW (GTK_BIN (standard_view)->child), start_path, end_path);
}
@@ -422,7 +423,7 @@ static void
thunar_abstract_icon_view_highlight_path (ThunarStandardView *standard_view,
GtkTreePath *path)
{
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (standard_view));
exo_icon_view_set_drag_dest_item (EXO_ICON_VIEW (GTK_BIN (standard_view)->child), path, EXO_ICON_VIEW_DROP_INTO);
}
@@ -601,11 +602,11 @@ thunar_abstract_icon_view_button_release_event (ExoIconView *view,
{
GtkAction *action;
- g_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
- g_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_release_id > 0, FALSE);
+ _thunar_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_release_id > 0, FALSE);
/* run the selected action (if any) */
action = thunar_abstract_icon_view_gesture_action (abstract_icon_view);
@@ -646,11 +647,11 @@ thunar_abstract_icon_view_expose_event (ExoIconView *view,
cairo_t *cr;
#endif
- g_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
- g_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_release_id > 0, FALSE);
+ _thunar_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_release_id > 0, FALSE);
/* shade the abstract_icon view content while performing mouse gestures */
#if GTK_CHECK_VERSION(2,7,1)
@@ -727,11 +728,11 @@ thunar_abstract_icon_view_motion_notify_event (ExoIconView *view,
{
GdkRectangle area;
- g_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
- g_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
- g_return_val_if_fail (abstract_icon_view->priv->gesture_release_id > 0, FALSE);
+ _thunar_return_val_if_fail (EXO_IS_ICON_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view), FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_expose_id > 0, FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_motion_id > 0, FALSE);
+ _thunar_return_val_if_fail (abstract_icon_view->priv->gesture_release_id > 0, FALSE);
/* schedule a complete redraw on the first motion event */
if (abstract_icon_view->priv->gesture_current_x == abstract_icon_view->priv->gesture_start_x
@@ -765,7 +766,7 @@ thunar_abstract_icon_view_item_activated (ExoIconView *view,
{
GtkAction *action;
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view));
/* be sure to have only the double clicked item selected */
exo_icon_view_unselect_all (view);
@@ -804,7 +805,7 @@ thunar_abstract_icon_view_sort_column_changed (GtkTreeSortable *sortable,
static void
thunar_abstract_icon_view_zoom_level_changed (ThunarAbstractIconView *abstract_icon_view)
{
- g_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view));
+ _thunar_return_if_fail (THUNAR_IS_ABSTRACT_ICON_VIEW (abstract_icon_view));
/* we use the same trick as with ThunarDetailsView here, simply because its simple :-) */
gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (GTK_BIN (abstract_icon_view)->child),
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 60663882d890ea0c4efd407ddec1045d39fc43e9..01fb7dc08c652434c8b2eafa92c62a471800d834 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -39,6 +39,7 @@
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-progress-dialog.h>
#include <thunar/thunar-renamer-dialog.h>
#include <thunar/thunar-util.h>
@@ -391,7 +392,7 @@ thunar_application_launch (ThunarApplication *application,
GdkScreen *screen;
GError *error = NULL;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
/* parse the parent pointer */
screen = thunar_util_parse_parent (parent, &window);
@@ -481,9 +482,9 @@ static void
thunar_application_window_destroyed (GtkWidget *window,
ThunarApplication *application)
{
- g_return_if_fail (GTK_IS_WINDOW (window));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (g_list_find (application->windows, window) != NULL);
+ _thunar_return_if_fail (GTK_IS_WINDOW (window));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (g_list_find (application->windows, window) != NULL);
application->windows = g_list_remove (application->windows, window);
@@ -565,7 +566,7 @@ thunar_application_get (void)
gboolean
thunar_application_get_daemon (ThunarApplication *application)
{
- g_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
return application->daemon;
}
@@ -582,7 +583,7 @@ void
thunar_application_set_daemon (ThunarApplication *application,
gboolean daemon)
{
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
if (application->daemon != daemon)
{
@@ -609,7 +610,7 @@ thunar_application_get_windows (ThunarApplication *application)
GList *windows = NULL;
GList *lp;
- g_return_val_if_fail (THUNAR_IS_APPLICATION (application), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), NULL);
for (lp = application->windows; lp != NULL; lp = lp->next)
if (G_LIKELY (THUNAR_IS_WINDOW (lp->data)))
@@ -630,7 +631,7 @@ thunar_application_get_windows (ThunarApplication *application)
gboolean
thunar_application_has_windows (ThunarApplication *application)
{
- g_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
return (application->windows != NULL);
}
@@ -649,9 +650,9 @@ void
thunar_application_take_window (ThunarApplication *application,
GtkWindow *window)
{
- g_return_if_fail (GTK_IS_WINDOW (window));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (g_list_find (application->windows, window) == NULL);
+ _thunar_return_if_fail (GTK_IS_WINDOW (window));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (g_list_find (application->windows, window) == NULL);
/* connect to the "destroy" signal */
g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (thunar_application_window_destroyed), application);
@@ -682,9 +683,9 @@ thunar_application_open_window (ThunarApplication *application,
GtkWidget *window;
gchar *role;
- g_return_val_if_fail (THUNAR_IS_APPLICATION (application), NULL);
- g_return_val_if_fail (THUNAR_IS_FILE (directory), NULL);
- g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (directory), NULL);
+ _thunar_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), NULL);
/* generate a unique role for the new window (for session management) */
role = g_strdup_printf ("Thunar-%u-%u", (guint) time (NULL), (guint) g_random_int ());
@@ -729,10 +730,10 @@ thunar_application_bulk_rename (ThunarApplication *application,
gchar *filename;
gint n;
- g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
- g_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_return_val_if_fail (working_directory != NULL, FALSE);
+ _thunar_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (working_directory != NULL, FALSE);
/* determine the file for the working directory */
current_directory = thunar_file_get_for_uri (working_directory, error);
@@ -816,12 +817,12 @@ thunar_application_process_filenames (ThunarApplication *application,
GList *lp;
gint n;
- g_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
- g_return_val_if_fail (working_directory != NULL, FALSE);
- g_return_val_if_fail (filenames != NULL, FALSE);
- g_return_val_if_fail (*filenames != NULL, FALSE);
- g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), FALSE);
+ _thunar_return_val_if_fail (working_directory != NULL, FALSE);
+ _thunar_return_val_if_fail (filenames != NULL, FALSE);
+ _thunar_return_val_if_fail (*filenames != NULL, FALSE);
+ _thunar_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* try to process all filenames and convert them to the appropriate file objects */
for (n = 0; filenames[n] != NULL; ++n)
@@ -897,9 +898,9 @@ thunar_application_copy_to (ThunarApplication *application,
GList *target_path_list,
GClosure *new_files_closure)
{
- g_return_if_fail (g_list_length (source_path_list) == g_list_length (target_path_list));
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (g_list_length (source_path_list) == g_list_length (target_path_list));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* launch the operation */
thunar_application_launch (application, parent, "stock_folder-copy",
@@ -930,9 +931,9 @@ thunar_application_copy_into (ThunarApplication *application,
ThunarVfsPath *target_path,
GClosure *new_files_closure)
{
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (target_path != NULL);
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (target_path != NULL);
/* collect the target paths and launch the job */
thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
@@ -964,9 +965,9 @@ thunar_application_link_into (ThunarApplication *application,
ThunarVfsPath *target_path,
GClosure *new_files_closure)
{
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (target_path != NULL);
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (target_path != NULL);
/* collect the target paths and launch the job */
thunar_application_collect_and_launch (application, parent, "stock_link",
@@ -1002,9 +1003,9 @@ thunar_application_move_into (ThunarApplication *application,
const gchar *icon;
const gchar *text;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (target_path != NULL);
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (target_path != NULL);
/* determine the appropriate message text and the icon based on the target_path */
if (thunar_vfs_path_get_scheme (target_path) == THUNAR_VFS_PATH_SCHEME_TRASH)
@@ -1065,8 +1066,8 @@ thunar_application_unlink_files (ThunarApplication *application,
guint n_path_list = 0;
gint response;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* check if we should permanently delete the files (user holds shift) */
permanently = (gtk_get_current_event_state (&state) && (state & GDK_SHIFT_MASK) != 0);
@@ -1177,8 +1178,8 @@ thunar_application_creat (ThunarApplication *application,
GList *path_list,
GClosure *new_files_closure)
{
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* launch the operation */
thunar_application_launch (application, parent, "stock_new",
@@ -1217,8 +1218,8 @@ thunar_application_mkdir (ThunarApplication *application,
GList *path_list,
GClosure *new_files_closure)
{
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* launch the operation */
thunar_application_launch (application, parent, "stock_folder",
@@ -1248,8 +1249,8 @@ thunar_application_empty_trash (ThunarApplication *application,
GList path_list;
gint response;
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
/* parse the parent pointer */
screen = thunar_util_parse_parent (parent, &window);
@@ -1328,8 +1329,8 @@ thunar_application_restore_files (ThunarApplication *application,
gchar *display_name;
gint response = GTK_RESPONSE_YES;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_APPLICATION (application));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
/* determine the target paths for all files */
for (lp = trash_file_list; err == NULL && lp != NULL && response == GTK_RESPONSE_YES; lp = lp->next)
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index 77ed9dd6b0ac29c8328edfbc6c23013a990c0edc..961a4d6bf1a6d26bdfca0d7075c92d08eb735b20 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -28,6 +28,7 @@
#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-icon-factory.h>
#include <thunar/thunar-pango-extensions.h>
+#include <thunar/thunar-private.h>
@@ -252,8 +253,8 @@ thunar_chooser_button_activate (ThunarChooserButton *chooser_button,
ThunarVfsMimeInfo *info;
GError *error = NULL;
- g_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
- g_return_if_fail (GTK_IS_MENU_ITEM (item));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
+ _thunar_return_if_fail (GTK_IS_MENU_ITEM (item));
/* verify that we still have a valid file */
if (G_UNLIKELY (chooser_button->file == NULL))
@@ -290,7 +291,7 @@ thunar_chooser_button_activate_other (ThunarChooserButton *chooser_button)
GtkWidget *toplevel;
GtkWidget *dialog;
- g_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
/* determine the toplevel window for the chooser */
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser_button));
@@ -320,9 +321,9 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
GdkPixbuf *icon = NULL;
gint icon_size;
- g_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
- g_return_if_fail (chooser_button->file == file);
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
+ _thunar_return_if_fail (chooser_button->file == file);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* determine the mime info for the file */
info = thunar_file_get_mime_info (file);
@@ -428,9 +429,9 @@ thunar_chooser_button_pressed (ThunarChooserButton *chooser_button,
GList *lp;
gint icon_size;
- g_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
- g_return_if_fail (chooser_button->button == button);
- g_return_if_fail (GTK_IS_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
+ _thunar_return_if_fail (chooser_button->button == button);
+ _thunar_return_if_fail (GTK_IS_BUTTON (button));
/* verify that we have a valid file */
if (G_UNLIKELY (chooser_button->file == NULL))
@@ -556,7 +557,7 @@ thunar_chooser_button_new (void)
ThunarFile*
thunar_chooser_button_get_file (ThunarChooserButton *chooser_button)
{
- g_return_val_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button), NULL);
return chooser_button->file;
}
@@ -573,8 +574,8 @@ void
thunar_chooser_button_set_file (ThunarChooserButton *chooser_button,
ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
- g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button));
+ _thunar_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
/* check if we already use that file */
if (G_UNLIKELY (chooser_button->file == file))
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index 181e457c15a1046dc52149d864ed16164a8e37ec..6b3d9fbc1d1ea8b6fd81e00b2da59132ab2defe5 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -36,6 +36,7 @@
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-icon-factory.h>
+#include <thunar/thunar-private.h>
@@ -578,7 +579,7 @@ thunar_chooser_dialog_context_menu (ThunarChooserDialog *dialog,
GtkWidget *menu;
GMainLoop *loop;
- g_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
/* determine the selected row */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
@@ -636,7 +637,7 @@ thunar_chooser_dialog_update_accept (ThunarChooserDialog *dialog)
gboolean sensitive = FALSE;
GValue value = { 0, };
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
if (gtk_expander_get_expanded (GTK_EXPANDER (dialog->custom_expander)))
{
@@ -672,8 +673,8 @@ thunar_chooser_dialog_update_header (ThunarChooserDialog *dialog)
GdkPixbuf *icon;
gchar *text;
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
- g_return_if_fail (GTK_WIDGET_REALIZED (dialog));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (GTK_WIDGET_REALIZED (dialog));
/* check if we have a valid file set */
if (G_UNLIKELY (dialog->file == NULL))
@@ -738,7 +739,7 @@ thunar_chooser_dialog_action_remove (ThunarChooserDialog *dialog)
GError *error = NULL;
gint response;
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
/* determine the selected row */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
@@ -921,9 +922,9 @@ thunar_chooser_dialog_button_press_event (GtkWidget *tree_view,
GtkTreeSelection *selection;
GtkTreePath *path;
- g_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
- g_return_val_if_fail (dialog->tree_view == tree_view, FALSE);
- g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
+ _thunar_return_val_if_fail (dialog->tree_view == tree_view, FALSE);
+ _thunar_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
/* check if we should popup the context menu */
if (G_LIKELY (event->button == 3 && event->type == GDK_BUTTON_PRESS))
@@ -954,8 +955,8 @@ thunar_chooser_dialog_notify_expanded (GtkExpander *expander,
{
GtkTreeSelection *selection;
- g_return_if_fail (GTK_IS_EXPANDER (expander));
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (GTK_IS_EXPANDER (expander));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
/* clear the application selection whenever the expander
* is expanded to avoid confusion for the user.
@@ -980,8 +981,8 @@ thunar_chooser_dialog_notify_loading (ThunarChooserModel *model,
GtkTreePath *path;
GtkTreeIter iter;
- g_return_if_fail (THUNAR_IS_CHOOSER_MODEL (model));
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
/* expand the first tree view row (the recommended applications) */
if (G_LIKELY (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)))
@@ -1006,9 +1007,9 @@ static gboolean
thunar_chooser_dialog_popup_menu (GtkWidget *tree_view,
ThunarChooserDialog *dialog)
{
- g_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
- g_return_val_if_fail (dialog->tree_view == tree_view, FALSE);
- g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
+ _thunar_return_val_if_fail (dialog->tree_view == tree_view, FALSE);
+ _thunar_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
/* popup the context menu */
return thunar_chooser_dialog_context_menu (dialog, 0, gtk_get_current_event_time ());
@@ -1026,8 +1027,8 @@ thunar_chooser_dialog_row_activated (GtkTreeView *treeview,
GtkTreeIter iter;
GValue value = { 0, };
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
- g_return_if_fail (GTK_IS_TREE_VIEW (treeview));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (GTK_IS_TREE_VIEW (treeview));
/* determine the current chooser model */
model = gtk_tree_view_get_model (treeview);
@@ -1121,7 +1122,7 @@ thunar_chooser_dialog_new (void)
ThunarFile*
thunar_chooser_dialog_get_file (ThunarChooserDialog *dialog)
{
- g_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), NULL);
return dialog->file;
}
@@ -1141,8 +1142,8 @@ thunar_chooser_dialog_set_file (ThunarChooserDialog *dialog,
ThunarChooserModel *model;
ThunarVfsMimeInfo *mime_info;
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
- g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
/* disconnect from the previous file */
if (G_LIKELY (dialog->file != NULL))
@@ -1200,7 +1201,7 @@ thunar_chooser_dialog_set_file (ThunarChooserDialog *dialog,
gboolean
thunar_chooser_dialog_get_open (ThunarChooserDialog *dialog)
{
- g_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
return dialog->open;
}
@@ -1217,7 +1218,7 @@ void
thunar_chooser_dialog_set_open (ThunarChooserDialog *dialog,
gboolean open)
{
- g_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
/* apply the new state */
dialog->open = open;
@@ -1257,8 +1258,8 @@ thunar_show_chooser_dialog (gpointer parent,
GtkWidget *dialog;
GtkWidget *window = NULL;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* determine the screen for the dialog */
if (G_UNLIKELY (parent == NULL))
diff --git a/thunar/thunar-chooser-model.c b/thunar/thunar-chooser-model.c
index 38adc7135bfbef04bcd6d25be2f186b253a013d8..19b2d67e0a25af40eddc27395f7c2a46c2b749a7 100644
--- a/thunar/thunar-chooser-model.c
+++ b/thunar/thunar-chooser-model.c
@@ -31,6 +31,7 @@
#include <thunar/thunar-chooser-model.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-icon-factory.h>
+#include <thunar/thunar-private.h>
@@ -286,9 +287,9 @@ thunar_chooser_model_append (ThunarChooserModel *model,
GdkPixbuf *icon;
GList *lp;
- g_return_if_fail (THUNAR_IS_CHOOSER_MODEL (model));
- g_return_if_fail (title != NULL);
- g_return_if_fail (icon_name != NULL);
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_MODEL (model));
+ _thunar_return_if_fail (title != NULL);
+ _thunar_return_if_fail (icon_name != NULL);
/* query the default icon theme/factory */
icon_theme = gtk_icon_theme_get_default ();
@@ -358,8 +359,8 @@ thunar_chooser_model_import (ThunarChooserModel *model,
GList *lp;
GList *p;
- g_return_if_fail (THUNAR_IS_CHOOSER_MODEL (model));
- g_return_if_fail (model->mime_info != NULL);
+ _thunar_return_if_fail (THUNAR_IS_CHOOSER_MODEL (model));
+ _thunar_return_if_fail (model->mime_info != NULL);
/* determine the recommended applications for the mime info */
mime_database = thunar_vfs_mime_database_get_default ();
@@ -406,9 +407,9 @@ thunar_chooser_model_readdir (ThunarChooserModel *model,
gchar *p;
GDir *dp;
- g_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), NULL);
- g_return_val_if_fail (reldir == NULL || !g_path_is_absolute (reldir), NULL);
- g_return_val_if_fail (g_path_is_absolute (absdir), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), NULL);
+ _thunar_return_val_if_fail (reldir == NULL || !g_path_is_absolute (reldir), NULL);
+ _thunar_return_val_if_fail (g_path_is_absolute (absdir), NULL);
/* try to open the directory */
dp = g_dir_open (absdir, 0, NULL);
@@ -609,7 +610,7 @@ thunar_chooser_model_new (ThunarVfsMimeInfo *mime_info)
gboolean
thunar_chooser_model_get_loading (ThunarChooserModel *model)
{
- g_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), FALSE);
return (model->thread != NULL);
}
@@ -626,7 +627,7 @@ thunar_chooser_model_get_loading (ThunarChooserModel *model)
ThunarVfsMimeInfo*
thunar_chooser_model_get_mime_info (ThunarChooserModel *model)
{
- g_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), NULL);
return model->mime_info;
}
@@ -653,9 +654,9 @@ thunar_chooser_model_remove (ThunarChooserModel *model,
ThunarVfsMimeDatabase *mime_database;
gboolean succeed;
- g_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_return_val_if_fail (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (model), iter), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (model), iter), FALSE);
/* determine the mime application for the iter */
gtk_tree_model_get (GTK_TREE_MODEL (model), iter, THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, &mime_application, -1);
diff --git a/thunar/thunar-clipboard-manager.c b/thunar/thunar-clipboard-manager.c
index 92537eb318125a2b1adc60cceb1e3c3aa10214fa..6410209b437300fdb287aea9ea6b1d7882bed0ae 100644
--- a/thunar/thunar-clipboard-manager.c
+++ b/thunar/thunar-clipboard-manager.c
@@ -258,8 +258,8 @@ static void
thunar_clipboard_manager_file_destroyed (ThunarFile *file,
ThunarClipboardManager *manager)
{
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
- g_return_if_fail (g_list_find (manager->files, file) != NULL);
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (g_list_find (manager->files, file) != NULL);
/* remove the file from our list */
manager->files = g_list_remove (manager->files, file);
@@ -276,9 +276,9 @@ thunar_clipboard_manager_owner_changed (GtkClipboard *clipboard,
GdkEventOwnerChange *event,
ThunarClipboardManager *manager)
{
- g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
- g_return_if_fail (manager->clipboard == clipboard);
+ _thunar_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (manager->clipboard == clipboard);
/* need to take a reference on the manager, because the clipboards
* "targets received callback" mechanism is not cancellable.
@@ -384,9 +384,9 @@ thunar_clipboard_manager_targets_received (GtkClipboard *clipboard,
gint n_targets;
gint n;
- g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
- g_return_if_fail (manager->clipboard == clipboard);
+ _thunar_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (manager->clipboard == clipboard);
/* reset the "can-paste" state */
manager->can_paste = FALSE;
@@ -425,9 +425,9 @@ thunar_clipboard_manager_get_callback (GtkClipboard *clipboard,
gchar *string_list;
gchar *data;
- g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
- g_return_if_fail (manager->clipboard == clipboard);
+ _thunar_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (manager->clipboard == clipboard);
/* determine the path list from the file list */
path_list = thunar_file_list_to_path_list (manager->files);
@@ -448,7 +448,7 @@ thunar_clipboard_manager_get_callback (GtkClipboard *clipboard,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
}
/* cleanup */
@@ -465,9 +465,9 @@ thunar_clipboard_manager_clear_callback (GtkClipboard *clipboard,
ThunarClipboardManager *manager = THUNAR_CLIPBOARD_MANAGER (user_data);
GList *lp;
- g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
- g_return_if_fail (manager->clipboard == clipboard);
+ _thunar_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (manager->clipboard == clipboard);
/* release the pending files */
for (lp = manager->files; lp != NULL; lp = lp->next)
@@ -544,7 +544,7 @@ thunar_clipboard_manager_get_for_display (GdkDisplay *display)
ThunarClipboardManager *manager;
GtkClipboard *clipboard;
- g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+ _thunar_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
/* generate the quark on-demand */
if (G_UNLIKELY (thunar_clipboard_manager_quark == 0))
@@ -589,7 +589,7 @@ thunar_clipboard_manager_get_for_display (GdkDisplay *display)
gboolean
thunar_clipboard_manager_get_can_paste (ThunarClipboardManager *manager)
{
- g_return_val_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager), FALSE);
return manager->can_paste;
}
@@ -608,8 +608,8 @@ gboolean
thunar_clipboard_manager_has_cutted_file (ThunarClipboardManager *manager,
const ThunarFile *file)
{
- g_return_val_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager), FALSE);
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
return (manager->files_cutted && g_list_find (manager->files, file) != NULL);
}
@@ -629,7 +629,7 @@ void
thunar_clipboard_manager_copy_files (ThunarClipboardManager *manager,
GList *files)
{
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
thunar_clipboard_manager_transfer_files (manager, TRUE, files);
}
@@ -648,7 +648,7 @@ void
thunar_clipboard_manager_cut_files (ThunarClipboardManager *manager,
GList *files)
{
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
thunar_clipboard_manager_transfer_files (manager, FALSE, files);
}
@@ -677,8 +677,8 @@ thunar_clipboard_manager_paste_files (ThunarClipboardManager *manager,
{
ThunarClipboardPasteRequest *request;
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (manager));
+ _thunar_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
/* prepare the paste request */
request = _thunar_slice_new0 (ThunarClipboardPasteRequest);
diff --git a/thunar/thunar-column-editor.c b/thunar/thunar-column-editor.c
index 45f9b4aca302b88cce6e3534b2cf765469fb2373..acd7b530c2ff3fdc7ab797e5f0721517a1bcc93f 100644
--- a/thunar/thunar-column-editor.c
+++ b/thunar/thunar-column-editor.c
@@ -25,6 +25,7 @@
#include <thunar/thunar-column-editor.h>
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
@@ -335,8 +336,8 @@ thunar_column_editor_move_down (GtkWidget *button,
GtkTreeIter iter1;
GtkTreeIter iter2;
- g_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
- g_return_if_fail (GTK_IS_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
+ _thunar_return_if_fail (GTK_IS_BUTTON (button));
/* determine the selected tree iterator */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (column_editor->tree_view));
@@ -363,8 +364,8 @@ thunar_column_editor_move_up (GtkWidget *button,
GtkTreeIter iter1;
GtkTreeIter iter2;
- g_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
- g_return_if_fail (GTK_IS_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
+ _thunar_return_if_fail (GTK_IS_BUTTON (button));
/* determine the selected tree iterator */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (column_editor->tree_view));
@@ -399,9 +400,9 @@ thunar_column_editor_toggled (GtkCellRendererToggle *cell_renderer,
GtkTreeIter iter;
gboolean visible;
- g_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (cell_renderer));
- g_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
- g_return_if_fail (path_string != NULL);
+ _thunar_return_if_fail (GTK_IS_CELL_RENDERER_TOGGLE (cell_renderer));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
+ _thunar_return_if_fail (path_string != NULL);
/* determine the tree path for the string */
path = gtk_tree_path_new_from_string (path_string);
@@ -430,8 +431,8 @@ thunar_column_editor_toggle_visibility (GtkWidget *button,
GtkTreeIter iter;
gboolean visible;
- g_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
- g_return_if_fail (GTK_IS_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_EDITOR (column_editor));
+ _thunar_return_if_fail (GTK_IS_BUTTON (button));
/* determine the selected tree iterator */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (column_editor->tree_view));
@@ -562,7 +563,7 @@ thunar_show_column_editor (gpointer parent)
GtkWidget *dialog;
GdkScreen *screen;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
/* determine the screen for the dialog */
if (G_UNLIKELY (parent == NULL))
diff --git a/thunar/thunar-column-model.c b/thunar/thunar-column-model.c
index 4ea5bd5667bcdca668419e2610c9d5632d09f9da..1694d89a1f522c267d5b9b426b2e226f5c77847f 100644
--- a/thunar/thunar-column-model.c
+++ b/thunar/thunar-column-model.c
@@ -27,6 +27,7 @@
#include <thunar/thunar-column-model.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
@@ -276,7 +277,7 @@ thunar_column_model_get_column_type (GtkTreeModel *tree_model,
return G_TYPE_BOOLEAN;
}
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
return G_TYPE_INVALID;
}
@@ -290,8 +291,8 @@ thunar_column_model_get_iter (GtkTreeModel *tree_model,
ThunarColumnModel *column_model = THUNAR_COLUMN_MODEL (tree_model);
ThunarColumn column;
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
- g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
+ _thunar_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
/* check if the path is valid */
column = gtk_tree_path_get_indices (path)[0];
@@ -311,10 +312,8 @@ static GtkTreePath*
thunar_column_model_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- ThunarColumnModel *column_model = THUNAR_COLUMN_MODEL (tree_model);
-
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), NULL);
- g_return_val_if_fail (iter->stamp == column_model->stamp, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (tree_model), NULL);
+ _thunar_return_val_if_fail (iter->stamp == THUNAR_COLUMN_MODEL (tree_model)->stamp, NULL);
/* generate the path for the iterator */
return gtk_tree_path_new_from_indices (GPOINTER_TO_INT (iter->user_data), -1);
@@ -331,9 +330,9 @@ thunar_column_model_get_value (GtkTreeModel *tree_model,
ThunarColumnModel *column_model = THUNAR_COLUMN_MODEL (tree_model);
ThunarColumn column;
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (index < THUNAR_COLUMN_MODEL_N_COLUMNS);
- g_return_if_fail (iter->stamp == column_model->stamp);
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (index < THUNAR_COLUMN_MODEL_N_COLUMNS);
+ _thunar_return_if_fail (iter->stamp == column_model->stamp);
/* determine the column from the iterator */
column = GPOINTER_TO_INT (iter->user_data);
@@ -359,7 +358,7 @@ thunar_column_model_get_value (GtkTreeModel *tree_model,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
break;
}
}
@@ -370,11 +369,10 @@ static gboolean
thunar_column_model_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- ThunarColumnModel *column_model = THUNAR_COLUMN_MODEL (tree_model);
- ThunarColumn column;
+ ThunarColumn column;
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
- g_return_val_if_fail (iter->stamp == column_model->stamp, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (tree_model), FALSE);
+ _thunar_return_val_if_fail (iter->stamp == THUNAR_COLUMN_MODEL (tree_model)->stamp, FALSE);
/* move the iterator to the next column */
column = GPOINTER_TO_INT (iter->user_data) + 1;
@@ -393,7 +391,7 @@ thunar_column_model_iter_children (GtkTreeModel *tree_model,
{
ThunarColumnModel *column_model = THUNAR_COLUMN_MODEL (tree_model);
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
if (G_LIKELY (parent == NULL))
{
@@ -419,9 +417,7 @@ static gint
thunar_column_model_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- ThunarColumnModel *column_model = THUNAR_COLUMN_MODEL (tree_model);
-
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), 0);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (tree_model), 0);
return (iter == NULL) ? THUNAR_N_VISIBLE_COLUMNS : 0;
}
@@ -436,7 +432,7 @@ thunar_column_model_iter_nth_child (GtkTreeModel *tree_model,
{
ThunarColumnModel *column_model = THUNAR_COLUMN_MODEL (tree_model);
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
if (G_LIKELY (parent == NULL && n < THUNAR_N_VISIBLE_COLUMNS))
{
@@ -555,8 +551,8 @@ thunar_column_model_notify_column_order (ThunarPreferences *preferences,
GtkTreeIter iter;
gint n;
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
/* load the new column order */
thunar_column_model_load_column_order (column_model);
@@ -644,8 +640,8 @@ thunar_column_model_notify_column_widths (ThunarPreferences *preferences,
GParamSpec *pspec,
ThunarColumnModel *column_model)
{
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
/* load the new column widths */
thunar_column_model_load_column_widths (column_model);
@@ -735,8 +731,8 @@ thunar_column_model_notify_visible_columns (ThunarPreferences *preferences,
GtkTreeIter iter;
gint n;
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
/* load the new list of visible columns */
thunar_column_model_load_visible_columns (column_model);
@@ -807,9 +803,9 @@ thunar_column_model_exchange (ThunarColumnModel *column_model,
gint new_order[THUNAR_N_VISIBLE_COLUMNS];
gint n;
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (iter1->stamp == column_model->stamp);
- g_return_if_fail (iter2->stamp == column_model->stamp);
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (iter1->stamp == column_model->stamp);
+ _thunar_return_if_fail (iter2->stamp == column_model->stamp);
/* swap the columns */
column = column_model->order[GPOINTER_TO_INT (iter1->user_data)];
@@ -852,8 +848,8 @@ ThunarColumn
thunar_column_model_get_column_for_iter (ThunarColumnModel *column_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), -1);
- g_return_val_if_fail (iter->stamp == column_model->stamp, -1);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), -1);
+ _thunar_return_val_if_fail (iter->stamp == column_model->stamp, -1);
return column_model->order[GPOINTER_TO_INT (iter->user_data)];
}
@@ -871,7 +867,7 @@ thunar_column_model_get_column_for_iter (ThunarColumnModel *column_model,
const ThunarColumn*
thunar_column_model_get_column_order (ThunarColumnModel *column_model)
{
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), NULL);
return column_model->order;
}
@@ -895,9 +891,9 @@ thunar_column_model_get_column_name (ThunarColumnModel *column_model,
GEnumClass *klass;
gint n;
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), NULL);
- g_return_val_if_fail (column < THUNAR_N_VISIBLE_COLUMNS, NULL);
- g_return_val_if_fail (column >= 0, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), NULL);
+ _thunar_return_val_if_fail (column < THUNAR_N_VISIBLE_COLUMNS, NULL);
+ _thunar_return_val_if_fail (column >= 0, NULL);
/* determine the column name from the ThunarColumn enum type */
klass = g_type_class_ref (THUNAR_TYPE_COLUMN);
@@ -925,9 +921,9 @@ gboolean
thunar_column_model_get_column_visible (ThunarColumnModel *column_model,
ThunarColumn column)
{
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
- g_return_val_if_fail (column < THUNAR_N_VISIBLE_COLUMNS, FALSE);
- g_return_val_if_fail (column >= 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), FALSE);
+ _thunar_return_val_if_fail (column < THUNAR_N_VISIBLE_COLUMNS, FALSE);
+ _thunar_return_val_if_fail (column >= 0, FALSE);
return column_model->visible[column];
}
@@ -951,9 +947,9 @@ thunar_column_model_set_column_visible (ThunarColumnModel *column_model,
GtkTreeIter iter;
gint n;
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (column < THUNAR_N_VISIBLE_COLUMNS);
- g_return_if_fail (column >= 0);
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (column < THUNAR_N_VISIBLE_COLUMNS);
+ _thunar_return_if_fail (column >= 0);
/* cannot change the visibility of the name column */
if (G_UNLIKELY (column == THUNAR_COLUMN_NAME))
@@ -1006,9 +1002,9 @@ gint
thunar_column_model_get_column_width (ThunarColumnModel *column_model,
ThunarColumn column)
{
- g_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), -1);
- g_return_val_if_fail (column < THUNAR_N_VISIBLE_COLUMNS, -1);
- g_return_val_if_fail (column >= 0, -1);
+ _thunar_return_val_if_fail (THUNAR_IS_COLUMN_MODEL (column_model), -1);
+ _thunar_return_val_if_fail (column < THUNAR_N_VISIBLE_COLUMNS, -1);
+ _thunar_return_val_if_fail (column >= 0, -1);
return column_model->width[column];
}
@@ -1028,10 +1024,10 @@ thunar_column_model_set_column_width (ThunarColumnModel *column_model,
ThunarColumn column,
gint width)
{
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (column < THUNAR_N_VISIBLE_COLUMNS);
- g_return_if_fail (column >= 0);
- g_return_if_fail (width >= 0);
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (column < THUNAR_N_VISIBLE_COLUMNS);
+ _thunar_return_if_fail (column >= 0);
+ _thunar_return_if_fail (width >= 0);
/* check if we have a new width */
if (G_LIKELY (column_model->width[column] != width))
diff --git a/thunar/thunar-component.c b/thunar/thunar-component.c
index 7d7676802b821dba76a734cab08cac4d2dd5772b..46906acfb5f7c5c5312ab86b35a39d093f0d013d 100644
--- a/thunar/thunar-component.c
+++ b/thunar/thunar-component.c
@@ -24,6 +24,7 @@
#include <exo/exo.h>
#include <thunar/thunar-component.h>
+#include <thunar/thunar-private.h>
@@ -117,7 +118,7 @@ thunar_component_class_init (gpointer klass)
GList*
thunar_component_get_selected_files (ThunarComponent *component)
{
- g_return_val_if_fail (THUNAR_IS_COMPONENT (component), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_COMPONENT (component), NULL);
return (*THUNAR_COMPONENT_GET_IFACE (component)->get_selected_files) (component);
}
@@ -136,7 +137,7 @@ void
thunar_component_set_selected_files (ThunarComponent *component,
GList *selected_files)
{
- g_return_if_fail (THUNAR_IS_COMPONENT (component));
+ _thunar_return_if_fail (THUNAR_IS_COMPONENT (component));
(*THUNAR_COMPONENT_GET_IFACE (component)->set_selected_files) (component, selected_files);
}
@@ -156,7 +157,7 @@ thunar_component_set_selected_files (ThunarComponent *component,
GtkUIManager*
thunar_component_get_ui_manager (ThunarComponent *component)
{
- g_return_val_if_fail (THUNAR_IS_COMPONENT (component), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_COMPONENT (component), NULL);
return (*THUNAR_COMPONENT_GET_IFACE (component)->get_ui_manager) (component);
}
@@ -178,8 +179,8 @@ void
thunar_component_set_ui_manager (ThunarComponent *component,
GtkUIManager *ui_manager)
{
- g_return_if_fail (THUNAR_IS_COMPONENT (component));
- g_return_if_fail (ui_manager == NULL || GTK_IS_UI_MANAGER (ui_manager));
+ _thunar_return_if_fail (THUNAR_IS_COMPONENT (component));
+ _thunar_return_if_fail (ui_manager == NULL || GTK_IS_UI_MANAGER (ui_manager));
(*THUNAR_COMPONENT_GET_IFACE (component)->set_ui_manager) (component, ui_manager);
}
diff --git a/thunar/thunar-create-dialog.c b/thunar/thunar-create-dialog.c
index fe017e0e28afaaef4c45a96ed5e4249982fbbd25..33b802add3b28d85b47201a872b63d4a2be1c365 100644
--- a/thunar/thunar-create-dialog.c
+++ b/thunar/thunar-create-dialog.c
@@ -26,6 +26,7 @@
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-icon-factory.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-stock.h>
@@ -322,9 +323,9 @@ thunar_create_dialog_text_changed (GtkWidget *entry,
const gchar *text;
const gchar *p;
- g_return_if_fail (GTK_IS_ENTRY (entry));
- g_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
- g_return_if_fail (dialog->entry == entry);
+ _thunar_return_if_fail (GTK_IS_ENTRY (entry));
+ _thunar_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
+ _thunar_return_if_fail (dialog->entry == entry);
/* verify the new text */
text = gtk_entry_get_text (GTK_ENTRY (entry));
@@ -364,7 +365,7 @@ thunar_create_dialog_new (void)
const gchar*
thunar_create_dialog_get_filename (const ThunarCreateDialog *dialog)
{
- g_return_val_if_fail (THUNAR_IS_CREATE_DIALOG (dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_CREATE_DIALOG (dialog), NULL);
return gtk_entry_get_text (GTK_ENTRY (dialog->entry));
}
@@ -385,8 +386,8 @@ thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
const gchar *dot;
glong offset;
- g_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
- g_return_if_fail (filename != NULL);
+ _thunar_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
+ _thunar_return_if_fail (filename != NULL);
/* setup the new filename */
gtk_entry_set_text (GTK_ENTRY (dialog->entry), filename);
@@ -432,7 +433,7 @@ thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
ThunarVfsMimeInfo*
thunar_create_dialog_get_mime_info (const ThunarCreateDialog *dialog)
{
- g_return_val_if_fail (THUNAR_IS_CREATE_DIALOG (dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_CREATE_DIALOG (dialog), NULL);
return dialog->mime_info;
}
@@ -449,7 +450,7 @@ void
thunar_create_dialog_set_mime_info (ThunarCreateDialog *dialog,
ThunarVfsMimeInfo *mime_info)
{
- g_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
+ _thunar_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
/* release the previous mime info */
if (G_UNLIKELY (dialog->mime_info != NULL))
@@ -500,7 +501,7 @@ thunar_show_create_dialog (GtkWidget *parent,
GError *error = NULL;
gchar *name = NULL;
- g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
+ _thunar_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
/* determine the toplevel window */
window = (parent != NULL) ? gtk_widget_get_toplevel (parent) : NULL;
diff --git a/thunar/thunar-dbus-client.c b/thunar/thunar-dbus-client.c
index 8436c09b499dae7b70894775e316a7b132fb4002..82d6afc63b08bdbb142e7263eacd5fdbc4675be5 100644
--- a/thunar/thunar-dbus-client.c
+++ b/thunar/thunar-dbus-client.c
@@ -25,6 +25,7 @@
#include <dbus/dbus-glib-lowlevel.h>
#include <thunar/thunar-dbus-client.h>
+#include <thunar/thunar-private.h>
@@ -60,10 +61,10 @@ thunar_dbus_client_bulk_rename (const gchar *working_directory,
DBusError derror;
gchar *display_name;
- g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
- g_return_val_if_fail (g_path_is_absolute (working_directory), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_return_val_if_fail (filenames != NULL, FALSE);
+ _thunar_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
+ _thunar_return_val_if_fail (g_path_is_absolute (working_directory), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (filenames != NULL, FALSE);
/* initialize the DBusError struct */
dbus_error_init (&derror);
@@ -156,10 +157,10 @@ thunar_dbus_client_launch_files (const gchar *working_directory,
DBusError derror;
gchar *display_name;
- g_return_val_if_fail (g_path_is_absolute (working_directory), FALSE);
- g_return_val_if_fail (filenames != NULL && *filenames != NULL, FALSE);
- g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (g_path_is_absolute (working_directory), FALSE);
+ _thunar_return_val_if_fail (filenames != NULL && *filenames != NULL, FALSE);
+ _thunar_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* initialize the DBusError struct */
dbus_error_init (&derror);
@@ -239,7 +240,7 @@ thunar_dbus_client_terminate (GError **error)
DBusMessage *result;
DBusError derror;
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* initialize the DBusError struct */
dbus_error_init (&derror);
diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c
index f3ca93f4d9bec5545939975634155b986de0ea5d..2871a5fcc1476f07c1e4342c89aff6b7069d9e85 100644
--- a/thunar/thunar-dbus-service.c
+++ b/thunar/thunar-dbus-service.c
@@ -40,6 +40,7 @@
#include <thunar/thunar-file.h>
#include <thunar/thunar-gdk-extensions.h>
#include <thunar/thunar-preferences-dialog.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-properties-dialog.h>
@@ -307,9 +308,9 @@ static void
thunar_dbus_service_trash_bin_changed (ThunarDBusService *dbus_service,
ThunarFile *trash_bin)
{
- g_return_if_fail (THUNAR_IS_DBUS_SERVICE (dbus_service));
- g_return_if_fail (dbus_service->trash_bin == trash_bin);
- g_return_if_fail (THUNAR_IS_FILE (trash_bin));
+ _thunar_return_if_fail (THUNAR_IS_DBUS_SERVICE (dbus_service));
+ _thunar_return_if_fail (dbus_service->trash_bin == trash_bin);
+ _thunar_return_if_fail (THUNAR_IS_FILE (trash_bin));
/* emit the "trash-changed" signal with the new state */
g_signal_emit_by_name (G_OBJECT (dbus_service), "trash-changed", (thunar_file_get_size (trash_bin) > 0));
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index 7ef0bb0934b533e5172941301425e45ccb2e23a1..7d56045a6d5ec6461499081f648142b119f4e792 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -27,6 +27,7 @@
#include <thunar/thunar-details-view.h>
#include <thunar/thunar-details-view-ui.h>
#include <thunar/thunar-gtk-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-text-renderer.h>
@@ -458,7 +459,7 @@ thunar_details_view_get_selected_items (ThunarStandardView *standard_view)
{
GtkTreeSelection *selection;
- g_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view), NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (GTK_BIN (standard_view)->child));
return gtk_tree_selection_get_selected_rows (selection, NULL);
@@ -471,7 +472,7 @@ thunar_details_view_select_all (ThunarStandardView *standard_view)
{
GtkTreeSelection *selection;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (GTK_BIN (standard_view)->child));
gtk_tree_selection_select_all (selection);
@@ -484,7 +485,7 @@ thunar_details_view_unselect_all (ThunarStandardView *standard_view)
{
GtkTreeSelection *selection;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (GTK_BIN (standard_view)->child));
gtk_tree_selection_unselect_all (selection);
@@ -498,7 +499,7 @@ thunar_details_view_select_path (ThunarStandardView *standard_view,
{
GtkTreeSelection *selection;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (GTK_BIN (standard_view)->child));
gtk_tree_selection_select_path (selection, path);
@@ -514,7 +515,7 @@ thunar_details_view_set_cursor (ThunarStandardView *standard_view,
GtkCellRendererMode mode;
GtkTreeViewColumn *column;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
/* make sure the name renderer is editable */
mode = standard_view->name_renderer->mode;
@@ -541,7 +542,7 @@ thunar_details_view_scroll_to_path (ThunarStandardView *standard_view,
{
GtkTreeViewColumn *column;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
/* tell the tree view to scroll to the given row */
column = gtk_tree_view_get_column (GTK_TREE_VIEW (GTK_BIN (standard_view)->child), 0);
@@ -557,7 +558,7 @@ thunar_details_view_get_path_at_pos (ThunarStandardView *standard_view,
{
GtkTreePath *path;
- g_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view), NULL);
if (gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (GTK_BIN (standard_view)->child), x, y, &path, NULL))
return path;
@@ -572,7 +573,7 @@ thunar_details_view_get_visible_range (ThunarStandardView *standard_view,
GtkTreePath **start_path,
GtkTreePath **end_path)
{
- g_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view), FALSE);
#if GTK_CHECK_VERSION(2,8,0)
return gtk_tree_view_get_visible_range (GTK_TREE_VIEW (GTK_BIN (standard_view)->child), start_path, end_path);
@@ -587,7 +588,7 @@ static void
thunar_details_view_highlight_path (ThunarStandardView *standard_view,
GtkTreePath *path)
{
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (standard_view));
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (GTK_BIN (standard_view)->child), path, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
}
@@ -613,8 +614,8 @@ thunar_details_view_notify_width (GtkTreeViewColumn *tree_view_column,
{
ThunarColumn column;
- g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_view_column));
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
+ _thunar_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_view_column));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
/* lookup the column no for the given tree view column */
for (column = 0; column < THUNAR_N_VISIBLE_COLUMNS; ++column)
@@ -751,7 +752,7 @@ thunar_details_view_row_activated (GtkTreeView *tree_view,
GtkTreeSelection *selection;
GtkAction *action;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
/* be sure to have only the double clicked item selected */
selection = gtk_tree_view_get_selection (tree_view);
@@ -773,9 +774,9 @@ thunar_details_view_columns_changed (ThunarColumnModel *column_model,
const ThunarColumn *column_order;
ThunarColumn column;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
- g_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
- g_return_if_fail (details_view->column_model == column_model);
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
+ _thunar_return_if_fail (THUNAR_IS_COLUMN_MODEL (column_model));
+ _thunar_return_if_fail (details_view->column_model == column_model);
/* determine the new column order */
column_order = thunar_column_model_get_column_order (column_model);
@@ -803,7 +804,7 @@ thunar_details_view_zoom_level_changed (ThunarDetailsView *details_view)
{
ThunarColumn column;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
/* determine the list of tree view columns */
for (column = 0; column < THUNAR_N_VISIBLE_COLUMNS; ++column)
@@ -833,8 +834,8 @@ static void
thunar_details_view_action_setup_columns (GtkAction *action,
ThunarDetailsView *details_view)
{
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
- g_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
/* popup the column editor dialog */
thunar_show_column_editor (details_view);
@@ -869,7 +870,7 @@ thunar_details_view_new (void)
gboolean
thunar_details_view_get_fixed_columns (ThunarDetailsView *details_view)
{
- g_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (details_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (details_view), FALSE);
return details_view->fixed_columns;
}
@@ -889,7 +890,7 @@ thunar_details_view_set_fixed_columns (ThunarDetailsView *details_view,
ThunarColumn column;
gint width;
- g_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
+ _thunar_return_if_fail (THUNAR_IS_DETAILS_VIEW (details_view));
/* normalize the value */
fixed_columns = !!fixed_columns;
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index af1aca4f0e75878b8b09dd0c9d8a387057473581..0f766a84584871b16492b6632010fd4b27e2bb94 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -32,6 +32,7 @@
#endif
#include <thunar/thunar-dialogs.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-util.h>
@@ -73,7 +74,7 @@ thunar_dialogs_show_about (GtkWindow *parent,
va_list args;
gchar *comments;
- g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
+ _thunar_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
/* determine the comments */
va_start (args, format);
@@ -138,7 +139,7 @@ thunar_dialogs_show_error (gpointer parent,
va_list args;
gchar *primary_text;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
/* parse the parent pointer */
screen = thunar_util_parse_parent (parent, &window);
@@ -260,8 +261,8 @@ thunar_dialogs_show_job_ask (GtkWindow *parent,
gint response;
gint n, m;
- g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), THUNAR_VFS_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (g_utf8_validate (question, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (g_utf8_validate (question, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
/* try to separate the question into primary and secondary parts */
separator = strstr (question, ": ");
@@ -389,8 +390,8 @@ thunar_dialogs_show_job_error (GtkWindow *parent,
GString *secondary = g_string_sized_new (256);
GString *primary = g_string_sized_new (256);
- g_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
- g_return_if_fail (error != NULL && error->message != NULL);
+ _thunar_return_if_fail (parent == NULL || GTK_IS_WINDOW (parent));
+ _thunar_return_if_fail (error != NULL && error->message != NULL);
/* try to separate the message into primary and secondary parts */
separator = strstr (error->message, ": ");
diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c
index d3d35e39082a891d30f4e46b81da51639f508b93..cfef788983a31411f08cf24e0e41c8b3e41cdd99 100644
--- a/thunar/thunar-dnd.c
+++ b/thunar/thunar-dnd.c
@@ -24,6 +24,7 @@
#include <thunar/thunar-application.h>
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-dnd.h>
+#include <thunar/thunar-private.h>
@@ -69,7 +70,7 @@ thunar_dnd_ask (GtkWidget *widget,
GMainLoop *loop;
guint n;
- g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
+ _thunar_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
/* prepare the internal loop */
loop = g_main_loop_new (NULL, FALSE);
@@ -153,9 +154,9 @@ thunar_dnd_perform (GtkWidget *widget,
gboolean succeed = TRUE;
GError *error = NULL;
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), FALSE);
+ _thunar_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (GTK_WIDGET_REALIZED (widget), FALSE);
/* query a reference on the application object */
application = thunar_application_get ();
diff --git a/thunar/thunar-emblem-chooser.c b/thunar/thunar-emblem-chooser.c
index a83d9c303c3250eee2e8a603e425cce996310c81..90dbeaa3a55d8f676b57652f1df00b4f2a13909a 100644
--- a/thunar/thunar-emblem-chooser.c
+++ b/thunar/thunar-emblem-chooser.c
@@ -30,6 +30,7 @@
#include <thunar/thunar-emblem-chooser.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
@@ -298,8 +299,8 @@ thunar_emblem_chooser_button_toggled (GtkToggleButton *button,
GList *children;
GList *lp;
- g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
- g_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
+ _thunar_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
/* we just ignore toggle events if no file is set */
if (G_LIKELY (chooser->file == NULL))
@@ -334,9 +335,9 @@ thunar_emblem_chooser_file_changed (ThunarFile *file,
GList *children;
GList *lp;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
- g_return_if_fail (chooser->file == file);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
+ _thunar_return_if_fail (chooser->file == file);
/* temporarily reset the file attribute */
chooser->file = NULL;
@@ -366,9 +367,9 @@ static void
thunar_emblem_chooser_theme_changed (GtkIconTheme *icon_theme,
ThunarEmblemChooser *chooser)
{
- g_return_if_fail (GTK_IS_ICON_THEME (icon_theme));
- g_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
- g_return_if_fail (chooser->icon_theme == icon_theme);
+ _thunar_return_if_fail (GTK_IS_ICON_THEME (icon_theme));
+ _thunar_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
+ _thunar_return_if_fail (chooser->icon_theme == icon_theme);
/* drop the current buttons */
gtk_container_foreach (GTK_CONTAINER (chooser->table), (GtkCallback) gtk_widget_destroy, NULL);
@@ -505,7 +506,7 @@ thunar_emblem_chooser_new (void)
ThunarFile*
thunar_emblem_chooser_get_file (const ThunarEmblemChooser *chooser)
{
- g_return_val_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser), NULL);
return chooser->file;
}
@@ -522,8 +523,8 @@ void
thunar_emblem_chooser_set_file (ThunarEmblemChooser *chooser,
ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
- g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_EMBLEM_CHOOSER (chooser));
+ _thunar_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
if (G_LIKELY (chooser->file != file))
{
diff --git a/thunar/thunar-file-monitor.c b/thunar/thunar-file-monitor.c
index 8733bc613b167979da28284b7a445a537429ddf8..038570171bb2d39ad12721842ca84543e8ca9be3 100644
--- a/thunar/thunar-file-monitor.c
+++ b/thunar/thunar-file-monitor.c
@@ -22,6 +22,7 @@
#endif
#include <thunar/thunar-file-monitor.h>
+#include <thunar/thunar-private.h>
@@ -176,7 +177,7 @@ thunar_file_monitor_get_default (void)
void
thunar_file_monitor_file_changed (ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
if (G_LIKELY (file_monitor_default != NULL))
g_signal_emit (G_OBJECT (file_monitor_default), file_monitor_signals[FILE_CHANGED], 0, file);
@@ -195,7 +196,7 @@ thunar_file_monitor_file_changed (ThunarFile *file)
void
thunar_file_monitor_file_destroyed (ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
if (G_LIKELY (file_monitor_default != NULL))
g_signal_emit (G_OBJECT (file_monitor_default), file_monitor_signals[FILE_DESTROYED], 0, file);
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index aabd4aa7f06de9c5627f3457ae87ab72becfabe1..cdfbedc49dad0160e452b568c5883e589b2554d1 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -49,6 +49,7 @@
#include <thunar/thunar-file.h>
#include <thunar/thunar-file-monitor.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-util.h>
@@ -590,9 +591,9 @@ thunar_file_monitor (ThunarVfsMonitor *monitor,
{
ThunarFile *file = THUNAR_FILE (user_data);
- g_return_if_fail (THUNAR_VFS_IS_MONITOR (monitor));
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (thunar_vfs_path_equal (file->info->path, event_path));
+ _thunar_return_if_fail (THUNAR_VFS_IS_MONITOR (monitor));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (thunar_vfs_path_equal (file->info->path, event_path));
/* just to be sure... */
if (G_UNLIKELY (!thunar_vfs_path_equal (handle_path, event_path)))
@@ -644,7 +645,7 @@ thunar_file_get_for_info (ThunarVfsInfo *info)
{
ThunarFile *file;
- g_return_val_if_fail (info != NULL, NULL);
+ _thunar_return_val_if_fail (info != NULL, NULL);
/* check if we already have a cached version of that file */
file = thunar_file_cache_lookup (info->path);
@@ -699,7 +700,7 @@ thunar_file_get_for_path (ThunarVfsPath *path,
ThunarVfsInfo *info;
ThunarFile *file;
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
/* see if we have the corresponding file cached already */
file = thunar_file_cache_lookup (path);
@@ -748,8 +749,8 @@ thunar_file_get_for_uri (const gchar *uri,
ThunarVfsPath *path;
ThunarFile *file;
- g_return_val_if_fail (uri != NULL, NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+ _thunar_return_val_if_fail (uri != NULL, NULL);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
/* determine the path for the URI */
path = thunar_vfs_path_new (uri, error);
@@ -787,8 +788,8 @@ ThunarFile*
thunar_file_get_parent (const ThunarFile *file,
GError **error)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
if (!thunar_file_has_parent (file))
{
@@ -821,9 +822,9 @@ thunar_file_execute (ThunarFile *file,
GList *path_list,
GError **error)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
return thunar_vfs_info_execute (file->info, screen, path_list, NULL, error);
}
@@ -861,9 +862,9 @@ thunar_file_launch (ThunarFile *file,
gboolean succeed;
GList path_list;
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_return_val_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent), FALSE);
/* determine the screen for the parent */
if (G_UNLIKELY (parent == NULL))
@@ -939,9 +940,9 @@ thunar_file_rename (ThunarFile *file,
gboolean succeed;
gint watch_count;;
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- g_return_val_if_fail (g_utf8_validate (name, -1, NULL), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (g_utf8_validate (name, -1, NULL), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* remember the previous path */
previous_path = thunar_vfs_path_ref (file->info->path);
@@ -1020,8 +1021,8 @@ thunar_file_accepts_drop (ThunarFile *file,
GList *lp;
guint n;
- g_return_val_if_fail (THUNAR_IS_FILE (file), 0);
- g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), 0);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), 0);
+ _thunar_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), 0);
/* we can never drop an empty list */
if (G_UNLIKELY (path_list == NULL))
@@ -1144,14 +1145,14 @@ ThunarVfsFileTime
thunar_file_get_date (const ThunarFile *file,
ThunarFileDateType date_type)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
switch (date_type)
{
case THUNAR_FILE_DATE_ACCESSED: return file->info->atime;
case THUNAR_FILE_DATE_CHANGED: return file->info->ctime;
case THUNAR_FILE_DATE_MODIFIED: return file->info->mtime;
- default: g_assert_not_reached ();
+ default: _thunar_assert_not_reached ();
}
return (ThunarVfsFileTime) -1;
@@ -1196,7 +1197,7 @@ thunar_file_get_mode_string (const ThunarFile *file)
ThunarVfsFileMode mode;
gchar *text;
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
kind = thunar_file_get_kind (file);
mode = thunar_file_get_mode (file);
@@ -1215,7 +1216,7 @@ thunar_file_get_mode_string (const ThunarFile *file)
case THUNAR_VFS_FILE_TYPE_CHARDEV: text[0] = 'c'; break;
case THUNAR_VFS_FILE_TYPE_FIFO: text[0] = 'f'; break;
case THUNAR_VFS_FILE_TYPE_UNKNOWN: text[0] = ' '; break;
- default: g_assert_not_reached ();
+ default: _thunar_assert_not_reached ();
}
/* permission flags */
@@ -1260,7 +1261,7 @@ thunar_file_get_size_string (const ThunarFile *file)
{
ThunarVfsFileSize size;
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
size = thunar_file_get_size (file);
@@ -1286,8 +1287,8 @@ ThunarVfsVolume*
thunar_file_get_volume (const ThunarFile *file,
ThunarVfsVolumeManager *volume_manager)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager), NULL);
return thunar_vfs_volume_manager_get_volume_by_info (volume_manager, file->info);
}
@@ -1309,7 +1310,7 @@ thunar_file_get_volume (const ThunarFile *file,
ThunarVfsGroup*
thunar_file_get_group (const ThunarFile *file)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
return thunar_vfs_user_manager_get_group_by_id (user_manager, file->info->gid);
}
@@ -1331,7 +1332,7 @@ thunar_file_get_group (const ThunarFile *file)
ThunarVfsUser*
thunar_file_get_user (const ThunarFile *file)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
return thunar_vfs_user_manager_get_user_by_id (user_manager, file->info->uid);
}
@@ -1357,7 +1358,7 @@ thunar_file_get_deletion_date (const ThunarFile *file)
time_t time;
gchar *date;
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
/* query the DeletionDate from the trash backend */
date = thunar_vfs_info_get_metadata (file->info, THUNAR_VFS_INFO_METADATA_TRASH_DELETION_DATE, NULL);
@@ -1393,7 +1394,7 @@ thunar_file_get_deletion_date (const ThunarFile *file)
gchar*
thunar_file_get_original_path (const ThunarFile *file)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
/* query the OriginalPath from the trash backend */
return thunar_vfs_info_get_metadata (file->info, THUNAR_VFS_INFO_METADATA_TRASH_ORIGINAL_PATH, NULL);
@@ -1413,7 +1414,7 @@ thunar_file_get_original_path (const ThunarFile *file)
gboolean
thunar_file_is_chmodable (const ThunarFile *file)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
/* we can only change the mode if we the euid is
* a) equal to the file owner id
@@ -1442,7 +1443,7 @@ thunar_file_is_renameable (const ThunarFile *file)
{
gboolean renameable = FALSE;
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
/* we cannot the node node or trashed files */
if (!thunar_file_is_root (file) && !thunar_file_is_trashed (file))
@@ -1486,7 +1487,7 @@ thunar_file_get_emblem_names (ThunarFile *file)
gchar **emblem_names;
GList *emblems = NULL;
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
/* check if we need to load the emblems_list from the metafile */
if (G_UNLIKELY ((file->flags & THUNAR_FILE_OWNS_EMBLEM_NAMES) == 0))
@@ -1560,7 +1561,7 @@ thunar_file_set_emblem_names (ThunarFile *file,
gchar *emblems_string;
gint n;
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* allocate a zero-terminated array for the emblem names */
emblems = g_new0 (gchar *, g_list_length (emblem_names) + 1);
@@ -1613,8 +1614,8 @@ thunar_file_get_icon_name (const ThunarFile *file,
{
const gchar *icon_name;
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
/* special icon for the home node */
if (G_UNLIKELY (thunar_file_is_home (file))
@@ -1675,8 +1676,8 @@ thunar_file_get_metadata (ThunarFile *file,
ThunarMetafileKey key,
const gchar *default_value)
{
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (key < THUNAR_METAFILE_N_KEYS, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (key < THUNAR_METAFILE_N_KEYS, NULL);
return thunar_metafile_fetch (thunar_file_get_metafile (file),
file->info->path, key,
@@ -1701,10 +1702,10 @@ thunar_file_set_metadata (ThunarFile *file,
const gchar *value,
const gchar *default_value)
{
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (key < THUNAR_METAFILE_N_KEYS);
- g_return_if_fail (default_value != NULL);
- g_return_if_fail (value != NULL);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (key < THUNAR_METAFILE_N_KEYS);
+ _thunar_return_if_fail (default_value != NULL);
+ _thunar_return_if_fail (value != NULL);
thunar_metafile_store (thunar_file_get_metafile (file),
file->info->path, key, value,
@@ -1735,8 +1736,8 @@ thunar_file_watch (ThunarFile *file)
ThunarVfsMonitorHandle *handle;
gint watch_count;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_FILE_GET_WATCH_COUNT (file) >= 0);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_FILE_GET_WATCH_COUNT (file) >= 0);
watch_count = THUNAR_FILE_GET_WATCH_COUNT (file);
@@ -1775,8 +1776,8 @@ thunar_file_unwatch (ThunarFile *file)
{
gint watch_count;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_FILE_GET_WATCH_COUNT (file) > 0);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_FILE_GET_WATCH_COUNT (file) > 0);
watch_count = THUNAR_FILE_GET_WATCH_COUNT (file);
@@ -1806,7 +1807,7 @@ thunar_file_reload (ThunarFile *file)
{
ThunarVfsInfo *info;
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* re-query the file info */
info = thunar_vfs_info_new_for_path (file->info->path, NULL);
@@ -1841,7 +1842,7 @@ thunar_file_reload (ThunarFile *file)
void
thunar_file_destroy (ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
if (G_LIKELY ((file->flags & THUNAR_FILE_IN_DESTRUCTION) == 0))
{
@@ -1915,8 +1916,8 @@ thunar_file_compare_by_name (const ThunarFile *file_a,
/* probably too expensive to do the instance check every time
* this function is called, so only for debugging builds.
*/
- g_return_val_if_fail (THUNAR_IS_FILE (file_a), 0);
- g_return_val_if_fail (THUNAR_IS_FILE (file_b), 0);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file_a), 0);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file_b), 0);
#endif
/* we compare only the display names (UTF-8!) */
diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
index c1ae1576bc2f47f64253f4166e481d9391026ca6..37057eab59fc05cb6689ad72eedec9d91a7c8e4f 100644
--- a/thunar/thunar-folder.c
+++ b/thunar/thunar-folder.c
@@ -24,6 +24,7 @@
#include <thunar/thunar-file-monitor.h>
#include <thunar/thunar-folder.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
@@ -301,9 +302,9 @@ thunar_folder_error (ThunarVfsJob *job,
GError *error,
ThunarFolder *folder)
{
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (folder->job == job);
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (folder->job == job);
/* tell the consumer about the problem */
g_signal_emit (G_OBJECT (folder), folder_signals[ERROR], 0, error);
@@ -319,10 +320,10 @@ thunar_folder_infos_ready (ThunarVfsJob *job,
ThunarFile *file;
GList *lp;
- g_return_val_if_fail (THUNAR_IS_FOLDER (folder), FALSE);
- g_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
- g_return_val_if_fail (folder->handle == NULL, FALSE);
- g_return_val_if_fail (folder->job == job, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FOLDER (folder), FALSE);
+ _thunar_return_val_if_fail (THUNAR_VFS_IS_JOB (job), FALSE);
+ _thunar_return_val_if_fail (folder->handle == NULL, FALSE);
+ _thunar_return_val_if_fail (folder->job == job, FALSE);
/* turn the info list into a file list */
for (lp = infos; lp != NULL; lp = lp->next)
@@ -354,11 +355,11 @@ thunar_folder_finished (ThunarVfsJob *job,
GList *files;
GList *lp;
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (THUNAR_IS_FILE (folder->corresponding_file));
- g_return_if_fail (folder->handle == NULL);
- g_return_if_fail (folder->job == job);
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (THUNAR_IS_FILE (folder->corresponding_file));
+ _thunar_return_if_fail (folder->handle == NULL);
+ _thunar_return_if_fail (folder->job == job);
/* check if we need to merge new files with existing files */
if (G_UNLIKELY (folder->files != NULL))
@@ -449,9 +450,9 @@ thunar_folder_file_changed (ThunarFileMonitor *file_monitor,
ThunarFile *file,
ThunarFolder *folder)
{
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
/* check if the corresponding file changed... */
if (G_UNLIKELY (folder->corresponding_file == file))
@@ -471,9 +472,9 @@ thunar_folder_file_destroyed (ThunarFileMonitor *file_monitor,
GList files;
GList *lp;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
/* check if the corresponding file was destroyed */
if (G_UNLIKELY (folder->corresponding_file == file))
@@ -515,11 +516,11 @@ thunar_folder_monitor (ThunarVfsMonitor *monitor,
GList *lp;
GList list;
- g_return_if_fail (THUNAR_VFS_IS_MONITOR (monitor));
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (folder->monitor == monitor);
- g_return_if_fail (folder->handle == handle);
- g_return_if_fail (folder->job == NULL);
+ _thunar_return_if_fail (THUNAR_VFS_IS_MONITOR (monitor));
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (folder->monitor == monitor);
+ _thunar_return_if_fail (folder->handle == handle);
+ _thunar_return_if_fail (folder->job == NULL);
/* check on which file the event occurred */
if (!thunar_vfs_path_equal (event_path, thunar_file_get_path (folder->corresponding_file)))
@@ -584,8 +585,8 @@ thunar_folder_get_for_file (ThunarFile *file)
{
ThunarFolder *folder;
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (thunar_file_is_directory (file), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (thunar_file_is_directory (file), NULL);
/* determine the "thunar-folder" quark on-demand */
if (G_UNLIKELY (thunar_folder_quark == 0))
@@ -634,7 +635,7 @@ thunar_folder_get_for_file (ThunarFile *file)
ThunarFile*
thunar_folder_get_corresponding_file (const ThunarFolder *folder)
{
- g_return_val_if_fail (THUNAR_IS_FOLDER (folder), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FOLDER (folder), NULL);
return folder->corresponding_file;
}
@@ -652,7 +653,7 @@ thunar_folder_get_corresponding_file (const ThunarFolder *folder)
GList*
thunar_folder_get_files (const ThunarFolder *folder)
{
- g_return_val_if_fail (THUNAR_IS_FOLDER (folder), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FOLDER (folder), NULL);
return folder->files;
}
@@ -670,7 +671,7 @@ thunar_folder_get_files (const ThunarFolder *folder)
gboolean
thunar_folder_get_loading (const ThunarFolder *folder)
{
- g_return_val_if_fail (THUNAR_IS_FOLDER (folder), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FOLDER (folder), FALSE);
return (folder->job != NULL);
}
@@ -686,7 +687,7 @@ thunar_folder_get_loading (const ThunarFolder *folder)
void
thunar_folder_reload (ThunarFolder *folder)
{
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
/* check if we are currently connect to a job */
if (G_UNLIKELY (folder->job != NULL))
diff --git a/thunar/thunar-gdk-extensions.c b/thunar/thunar-gdk-extensions.c
index 5d4ff127700413b63beb02a1ec8e10f653d9008e..c2c9c33ac7f1617be61dfb876b84a01a3a3f94d1 100644
--- a/thunar/thunar-gdk-extensions.c
+++ b/thunar/thunar-gdk-extensions.c
@@ -35,6 +35,7 @@
#endif
#include <thunar/thunar-gdk-extensions.h>
+#include <thunar/thunar-private.h>
@@ -71,8 +72,8 @@ thunar_gdk_screen_open (const gchar *display_name,
gchar *end;
gint num = 0;
- g_return_val_if_fail (display_name != NULL, NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+ _thunar_return_val_if_fail (display_name != NULL, NULL);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
/* check if the default screen should be opened */
if (G_UNLIKELY (*display_name == '\0'))
diff --git a/thunar/thunar-gdk-pixbuf-extensions.c b/thunar/thunar-gdk-pixbuf-extensions.c
index d173e08300f03d97642af2a58282e3777da7dd76..06c3cd9089ffff42e2ba3844b050675c1b816200 100644
--- a/thunar/thunar-gdk-pixbuf-extensions.c
+++ b/thunar/thunar-gdk-pixbuf-extensions.c
@@ -25,6 +25,7 @@
#endif
#include <thunar/thunar-gdk-pixbuf-extensions.h>
+#include <thunar/thunar-private.h>
@@ -107,8 +108,8 @@ thunar_gdk_pixbuf_frame (GdkPixbuf *src,
gint src_width;
gint src_height;
- g_return_val_if_fail (GDK_IS_PIXBUF (src), NULL);
- g_return_val_if_fail (GDK_IS_PIXBUF (frame), NULL);
+ _thunar_return_val_if_fail (GDK_IS_PIXBUF (src), NULL);
+ _thunar_return_val_if_fail (GDK_IS_PIXBUF (frame), NULL);
src_width = gdk_pixbuf_get_width (src);
src_height = gdk_pixbuf_get_height (src);
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index 001997bfbb437ab7e6fb5687f18259849547bfc5..c57d44782ece43b84cf244642c3e2fe551dd052b 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -26,6 +26,7 @@
#endif
#include <thunar/thunar-gtk-extensions.h>
+#include <thunar/thunar-private.h>
@@ -57,8 +58,8 @@ thunar_gtk_action_group_create_tool_item (GtkActionGroup *action_group,
GtkAction *action;
GtkWidget *widget;
- g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), NULL);
- g_return_val_if_fail (action_name != NULL, NULL);
+ _thunar_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), NULL);
+ _thunar_return_val_if_fail (action_name != NULL, NULL);
action = gtk_action_group_get_action (action_group, action_name);
if (G_UNLIKELY (action == NULL))
@@ -89,8 +90,8 @@ thunar_gtk_action_group_set_action_sensitive (GtkActionGroup *action_group,
{
GtkAction *action;
- g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
- g_return_if_fail (action_name != NULL && *action_name != '\0');
+ _thunar_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
+ _thunar_return_if_fail (action_name != NULL && *action_name != '\0');
/* query the action from the group */
action = gtk_action_group_get_action (action_group, action_name);
@@ -125,9 +126,9 @@ thunar_gtk_icon_factory_insert_icon (GtkIconFactory *icon_factory,
GtkIconSource *icon_source;
GtkIconSet *icon_set;
- g_return_if_fail (GTK_IS_ICON_FACTORY (icon_factory));
- g_return_if_fail (icon_name != NULL);
- g_return_if_fail (stock_id != NULL);
+ _thunar_return_if_fail (GTK_IS_ICON_FACTORY (icon_factory));
+ _thunar_return_if_fail (icon_name != NULL);
+ _thunar_return_if_fail (stock_id != NULL);
icon_set = gtk_icon_set_new ();
icon_source = gtk_icon_source_new ();
@@ -162,8 +163,8 @@ thunar_gtk_ui_manager_get_action_by_name (GtkUIManager *ui_manager,
GtkAction *action;
GList *lp;
- g_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
- g_return_val_if_fail (action_name != NULL, NULL);
+ _thunar_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
+ _thunar_return_val_if_fail (action_name != NULL, NULL);
/* check all action groups associated with the ui manager */
for (lp = gtk_ui_manager_get_action_groups (ui_manager); lp != NULL; lp = lp->next)
@@ -197,8 +198,8 @@ thunar_gtk_widget_set_tooltip (GtkWidget *widget,
va_list var_args;
gchar *tooltip;
- g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (g_utf8_validate (format, -1, NULL));
+ _thunar_return_if_fail (GTK_IS_WIDGET (widget));
+ _thunar_return_if_fail (g_utf8_validate (format, -1, NULL));
/* allocate the shared tooltips on-demand */
if (G_UNLIKELY (tooltips == NULL))
diff --git a/thunar/thunar-history.c b/thunar/thunar-history.c
index bc6ab513196640b9f889662145225dabdb1dd50b..9e818fe19e0c66e5b964760b23ec0fdea1d3a24f 100644
--- a/thunar/thunar-history.c
+++ b/thunar/thunar-history.c
@@ -24,6 +24,7 @@
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-history.h>
#include <thunar/thunar-navigator.h>
+#include <thunar/thunar-private.h>
@@ -341,8 +342,8 @@ static void
thunar_history_action_back (GtkAction *action,
ThunarHistory *history)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_HISTORY (history));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_HISTORY (history));
/* make sure the "back" list isn't empty */
if (G_UNLIKELY (history->back_list == NULL))
@@ -372,8 +373,8 @@ static void
thunar_history_action_forward (GtkAction *action,
ThunarHistory *history)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_HISTORY (history));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_HISTORY (history));
/* make sure the "forward" list isn't empty */
if (G_UNLIKELY (history->forward_list == NULL))
@@ -428,7 +429,7 @@ thunar_history_new (void)
GtkActionGroup*
thunar_history_get_action_group (const ThunarHistory *history)
{
- g_return_val_if_fail (THUNAR_IS_HISTORY (history), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_HISTORY (history), NULL);
return history->action_group;
}
@@ -448,8 +449,8 @@ void
thunar_history_set_action_group (ThunarHistory *history,
GtkActionGroup *action_group)
{
- g_return_if_fail (THUNAR_IS_HISTORY (history));
- g_return_if_fail (action_group == NULL || GTK_IS_ACTION_GROUP (action_group));
+ _thunar_return_if_fail (THUNAR_IS_HISTORY (history));
+ _thunar_return_if_fail (action_group == NULL || GTK_IS_ACTION_GROUP (action_group));
/* verify that we don't already use that action group */
if (G_UNLIKELY (history->action_group == action_group))
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index ad681143eb5ed83711014129a7182a4e30da99b5..720617ccd4bd0fd0db7d62f4c4211d35d4d3a8b8 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -36,6 +36,7 @@
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-icon-factory.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-thumbnail-frame.h>
#include <thunar/thunar-thumbnail-generator.h>
@@ -246,7 +247,7 @@ thunar_icon_factory_dispose (GObject *object)
{
ThunarIconFactory *factory = THUNAR_ICON_FACTORY (object);
- g_return_if_fail (THUNAR_IS_ICON_FACTORY (factory));
+ _thunar_return_if_fail (THUNAR_IS_ICON_FACTORY (factory));
if (G_UNLIKELY (factory->changed_idle_id >= 0))
g_source_remove (factory->changed_idle_id);
@@ -265,7 +266,7 @@ thunar_icon_factory_finalize (GObject *object)
ThunarIconFactory *factory = THUNAR_ICON_FACTORY (object);
guint n;
- g_return_if_fail (THUNAR_IS_ICON_FACTORY (factory));
+ _thunar_return_if_fail (THUNAR_IS_ICON_FACTORY (factory));
/* clear the recently used list */
for (n = 0; n < MAX_RECENTLY; ++n)
@@ -386,7 +387,7 @@ thunar_icon_factory_sweep_timer (gpointer user_data)
{
ThunarIconFactory *factory = THUNAR_ICON_FACTORY (user_data);
- g_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), FALSE);
GDK_THREADS_ENTER ();
@@ -531,9 +532,9 @@ thunar_icon_factory_lookup_icon (ThunarIconFactory *factory,
GtkIconInfo *icon_info;
GdkPixbuf *pixbuf = NULL;
- g_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
- g_return_val_if_fail (name != NULL && *name != '\0', NULL);
- g_return_val_if_fail (size > 0, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
+ _thunar_return_val_if_fail (name != NULL && *name != '\0', NULL);
+ _thunar_return_val_if_fail (size > 0, NULL);
/* prepare the lookup key */
lookup_key.name = (gchar *) name;
@@ -593,8 +594,8 @@ thunar_icon_factory_mark_recently_used (ThunarIconFactory *factory,
{
guint n;
- g_return_if_fail (THUNAR_IS_ICON_FACTORY (factory));
- g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
+ _thunar_return_if_fail (THUNAR_IS_ICON_FACTORY (factory));
+ _thunar_return_if_fail (GDK_IS_PIXBUF (pixbuf));
/* check if the icon is already on the list */
for (n = 0; n < MAX_RECENTLY; ++n)
@@ -731,7 +732,7 @@ thunar_icon_factory_get_for_icon_theme (GtkIconTheme *icon_theme)
ThunarPreferences *preferences;
ThunarIconFactory *factory;
- g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
+ _thunar_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
/* generate the quark on-demand */
if (G_UNLIKELY (thunar_icon_factory_quark == 0))
@@ -772,7 +773,7 @@ thunar_icon_factory_get_for_icon_theme (GtkIconTheme *icon_theme)
GtkIconTheme*
thunar_icon_factory_get_icon_theme (const ThunarIconFactory *factory)
{
- g_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
return factory->icon_theme;
}
@@ -804,8 +805,8 @@ thunar_icon_factory_load_icon (ThunarIconFactory *factory,
ThunarEmblemAttachPoints *attach_points,
gboolean wants_default)
{
- g_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
- g_return_val_if_fail (size > 0, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
+ _thunar_return_val_if_fail (size > 0, NULL);
/* cannot happen unless there's no XSETTINGS manager
* for the default screen, but just in case...
@@ -852,9 +853,9 @@ thunar_icon_factory_load_file_icon (ThunarIconFactory *factory,
GdkPixbuf *icon;
gchar *thumb_path;
- g_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (icon_size > 0, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (icon_size > 0, NULL);
/* check if there's a custom icon for the file */
icon_name = thunar_file_get_custom_icon (file);
diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index 778324184270004ead0aa94e6da060c34a43b107..dcc58fed1c9ec90acf6d6a9a44f1a5c6cd9a67e4 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -26,6 +26,7 @@
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-icon-factory.h>
#include <thunar/thunar-icon-renderer.h>
+#include <thunar/thunar-private.h>
@@ -548,7 +549,7 @@ thunar_icon_renderer_render (GtkCellRenderer *renderer,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
}
/* render the emblem */
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 52c85161eea02ab81dcd2c9ec872a0ac4e8627eb..baa6640684cbe1930a922538b2a5c9e21a12ef1f 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -35,6 +35,7 @@
#include <thunar/thunar-gtk-extensions.h>
#include <thunar/thunar-launcher.h>
#include <thunar/thunar-launcher-ui.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-sendto-model.h>
#include <thunar/thunar-stock.h>
@@ -1025,8 +1026,8 @@ thunar_launcher_action_open (GtkAction *action,
GList *files = NULL;
GList *lp;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* determine the screen on which to open the new windows */
screen = (launcher->widget != NULL) ? gtk_widget_get_screen (launcher->widget) : NULL;
@@ -1109,8 +1110,8 @@ static void
thunar_launcher_action_open_with_other (GtkAction *action,
ThunarLauncher *launcher)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* verify that we have atleast one selected file */
if (G_LIKELY (launcher->selected_files != NULL))
@@ -1126,8 +1127,8 @@ static void
thunar_launcher_action_open_in_new_window (GtkAction *action,
ThunarLauncher *launcher)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* open the selected directories in new windows */
thunar_launcher_open_windows (launcher, launcher->selected_files);
@@ -1144,8 +1145,8 @@ thunar_launcher_action_sendto_desktop (GtkAction *action,
ThunarVfsPath *home_path;
GList *paths;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* determine the source paths */
paths = thunar_file_list_to_path_list (launcher->selected_files);
@@ -1173,9 +1174,9 @@ static void
thunar_launcher_widget_destroyed (ThunarLauncher *launcher,
GtkWidget *widget)
{
- g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
- g_return_if_fail (launcher->widget == widget);
- g_return_if_fail (GTK_IS_WIDGET (widget));
+ _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+ _thunar_return_if_fail (launcher->widget == widget);
+ _thunar_return_if_fail (GTK_IS_WIDGET (widget));
/* just reset the widget property for the launcher */
thunar_launcher_set_widget (launcher, NULL);
@@ -1317,7 +1318,7 @@ thunar_launcher_new (void)
GtkWidget*
thunar_launcher_get_widget (const ThunarLauncher *launcher)
{
- g_return_val_if_fail (THUNAR_IS_LAUNCHER (launcher), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LAUNCHER (launcher), NULL);
return launcher->widget;
}
@@ -1334,8 +1335,8 @@ void
thunar_launcher_set_widget (ThunarLauncher *launcher,
GtkWidget *widget)
{
- g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
- g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
+ _thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+ _thunar_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
/* disconnect from the previous widget */
if (G_UNLIKELY (launcher->widget != NULL))
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index 5637b2c723f1a3e48930d7798c43eea8d7b56b62..c8ac8e0b4fee9bf31d576febb1ffa5723069218b 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -31,6 +31,7 @@
#include <thunar/thunar-file-monitor.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-list-model.h>
+#include <thunar/thunar-private.h>
@@ -614,7 +615,7 @@ thunar_list_model_get_column_type (GtkTreeModel *model,
return G_TYPE_STRING;
}
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
return G_TYPE_INVALID;
}
@@ -630,8 +631,8 @@ thunar_list_model_get_iter (GtkTreeModel *model,
gint n;
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
- g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
index = gtk_tree_path_get_indices (path)[0];
if (G_UNLIKELY (index >= store->nrows))
@@ -662,8 +663,8 @@ thunar_list_model_get_path (GtkTreeModel *model,
gint index = 0;
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
- g_return_val_if_fail (iter->stamp == store->stamp, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
+ _thunar_return_val_if_fail (iter->stamp == store->stamp, NULL);
for (row = store->rows; row != NULL; ++index, row = row->next)
if (row == iter->user_data)
@@ -693,11 +694,11 @@ thunar_list_model_get_value (GtkTreeModel *model,
gchar *str;
Row *row;
- g_return_if_fail (THUNAR_IS_LIST_MODEL (model));
- g_return_if_fail (iter->stamp == (THUNAR_LIST_MODEL (model))->stamp);
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (model));
+ _thunar_return_if_fail (iter->stamp == (THUNAR_LIST_MODEL (model))->stamp);
row = (Row *) iter->user_data;
- g_assert (row != NULL);
+ _thunar_assert (row != NULL);
switch (column)
{
@@ -789,7 +790,7 @@ thunar_list_model_get_value (GtkTreeModel *model,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
}
}
@@ -799,8 +800,8 @@ static gboolean
thunar_list_model_iter_next (GtkTreeModel *model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (model), FALSE);
- g_return_val_if_fail (iter->stamp == (THUNAR_LIST_MODEL (model))->stamp, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (iter->stamp == (THUNAR_LIST_MODEL (model))->stamp, FALSE);
iter->user_data = ((Row *) iter->user_data)->next;
return (iter->user_data != NULL);
@@ -815,7 +816,7 @@ thunar_list_model_iter_children (GtkTreeModel *model,
{
ThunarListModel *store = THUNAR_LIST_MODEL (model);
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
if (G_LIKELY (parent == NULL && store->rows != NULL))
{
@@ -844,7 +845,7 @@ thunar_list_model_iter_n_children (GtkTreeModel *model,
{
ThunarListModel *store = THUNAR_LIST_MODEL (model);
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), 0);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), 0);
return (iter == NULL) ? store->nrows : 0;
}
@@ -860,7 +861,7 @@ thunar_list_model_iter_nth_child (GtkTreeModel *model,
ThunarListModel *store = THUNAR_LIST_MODEL (model);
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
if (G_UNLIKELY (parent != NULL))
return FALSE;
@@ -919,7 +920,7 @@ thunar_list_model_get_sort_column_id (GtkTreeSortable *sortable,
{
ThunarListModel *store = THUNAR_LIST_MODEL (sortable);
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
if (store->sort_func == sort_by_mime_type)
*sort_column_id = THUNAR_COLUMN_MIME_TYPE;
@@ -942,7 +943,7 @@ thunar_list_model_get_sort_column_id (GtkTreeSortable *sortable,
else if (store->sort_func == sort_by_group)
*sort_column_id = THUNAR_COLUMN_GROUP;
else
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
if (order != NULL)
{
@@ -964,7 +965,7 @@ thunar_list_model_set_sort_column_id (GtkTreeSortable *sortable,
{
ThunarListModel *store = THUNAR_LIST_MODEL (sortable);
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
switch (sort_column_id)
{
@@ -1009,7 +1010,7 @@ thunar_list_model_set_sort_column_id (GtkTreeSortable *sortable,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
}
store->sort_sign = (order == GTK_SORT_ASCENDING) ? 1 : -1;
@@ -1113,8 +1114,8 @@ thunar_list_model_remove (ThunarListModel *store,
Row *tmp;
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
- g_return_val_if_fail (iter->stamp == store->stamp, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (iter->stamp == store->stamp, FALSE);
row = (Row *) iter->user_data;
next = row->next;
@@ -1171,7 +1172,7 @@ thunar_list_model_sort (ThunarListModel *store)
gint n;
Row *row;
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
if (G_UNLIKELY (store->nrows <= 1))
return;
@@ -1238,9 +1239,9 @@ thunar_list_model_file_changed (ThunarFileMonitor *file_monitor,
Row *prev;
Row *row;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
- g_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
/* check if we have a row for that file */
for (n = 0, prev = NULL, row = store->rows; row != NULL; ++n, prev = row, row = row->next)
@@ -1273,8 +1274,8 @@ static void
thunar_list_model_folder_destroy (ThunarFolder *folder,
ThunarListModel *store)
{
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
thunar_list_model_set_folder (store, NULL);
@@ -1288,9 +1289,9 @@ thunar_list_model_folder_error (ThunarFolder *folder,
const GError *error,
ThunarListModel *store)
{
- g_return_if_fail (error != NULL);
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (error != NULL);
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
/* forward the error signal */
g_signal_emit (G_OBJECT (store), list_model_signals[ERROR], 0, error);
@@ -1405,7 +1406,7 @@ thunar_list_model_files_removed (ThunarFolder *folder,
if (G_UNLIKELY (row == NULL))
{
/* file is hidden */
- g_assert (g_list_find (store->hidden, file) != NULL);
+ _thunar_assert (g_list_find (store->hidden, file) != NULL);
store->hidden = g_list_remove (store->hidden, file);
g_object_unref (G_OBJECT (file));
}
@@ -1628,7 +1629,7 @@ thunar_list_model_new (void)
ThunarListModel*
thunar_list_model_new_with_folder (ThunarFolder *folder)
{
- g_return_val_if_fail (THUNAR_IS_FOLDER (folder), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FOLDER (folder), NULL);
/* allocate the new list model */
return g_object_new (THUNAR_TYPE_LIST_MODEL,
@@ -1650,7 +1651,7 @@ thunar_list_model_new_with_folder (ThunarFolder *folder)
gboolean
thunar_list_model_get_case_sensitive (ThunarListModel *store)
{
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
return store->sort_case_sensitive;
}
@@ -1668,7 +1669,7 @@ void
thunar_list_model_set_case_sensitive (ThunarListModel *store,
gboolean case_sensitive)
{
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
/* normalize the setting */
case_sensitive = !!case_sensitive;
@@ -1699,7 +1700,7 @@ thunar_list_model_set_case_sensitive (ThunarListModel *store,
ThunarFolder*
thunar_list_model_get_folder (ThunarListModel *store)
{
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
return store->folder;
}
@@ -1722,8 +1723,8 @@ thunar_list_model_set_folder (ThunarListModel *store,
GList *lp;
Row *row;
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
- g_return_if_fail (folder == NULL || THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (folder == NULL || THUNAR_IS_FOLDER (folder));
/* check if we're not already using that folder */
if (G_UNLIKELY (store->folder == folder))
@@ -1772,8 +1773,8 @@ thunar_list_model_set_folder (ThunarListModel *store,
}
/* ... just to be sure! */
- g_assert (store->rows == NULL);
- g_assert (store->nrows == 0);
+ _thunar_assert (store->rows == NULL);
+ _thunar_assert (store->nrows == 0);
/* activate the new folder */
store->folder = folder;
@@ -1862,7 +1863,7 @@ thunar_list_model_set_folder (ThunarListModel *store,
gboolean
thunar_list_model_get_folders_first (ThunarListModel *store)
{
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
return store->sort_folders_first;
}
@@ -1877,7 +1878,7 @@ void
thunar_list_model_set_folders_first (ThunarListModel *store,
gboolean folders_first)
{
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
/* check if the new setting differs */
if ((store->sort_folders_first && folders_first)
@@ -1901,7 +1902,7 @@ thunar_list_model_set_folders_first (ThunarListModel *store,
gboolean
thunar_list_model_get_show_hidden (ThunarListModel *store)
{
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
return store->show_hidden;
}
@@ -1925,7 +1926,7 @@ thunar_list_model_set_show_hidden (ThunarListModel *store,
Row *prev;
Row *row;
- g_return_if_fail (THUNAR_IS_LIST_MODEL (store));
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (store));
/* check if the settings differ */
if ((store->show_hidden && show_hidden) || (!store->show_hidden && !show_hidden))
@@ -1972,7 +1973,7 @@ thunar_list_model_set_show_hidden (ThunarListModel *store,
}
else
{
- g_assert (store->hidden == NULL);
+ _thunar_assert (store->hidden == NULL);
/* unmerge all hidden elements */
for (hidden_rows = files = NULL, row = store->rows; row != NULL; row = row->next)
@@ -2022,12 +2023,12 @@ thunar_list_model_get_file (ThunarListModel *store,
{
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
- g_return_val_if_fail (iter->stamp == store->stamp, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
+ _thunar_return_val_if_fail (iter->stamp == store->stamp, NULL);
row = (Row *) iter->user_data;
- g_assert (row != NULL);
+ _thunar_assert (row != NULL);
return g_object_ref (row->file);
}
@@ -2046,7 +2047,7 @@ thunar_list_model_get_file (ThunarListModel *store,
gint
thunar_list_model_get_num_files (ThunarListModel *store)
{
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), 0);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), 0);
return store->nrows;
}
@@ -2079,7 +2080,7 @@ thunar_list_model_get_paths_for_files (ThunarListModel *store,
gint index = 0;
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
/* find the rows for the given files */
for (row = store->rows; row != NULL; ++index, row = row->next)
@@ -2116,8 +2117,8 @@ thunar_list_model_get_paths_for_pattern (ThunarListModel *store,
gint index = 0;
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
- g_return_val_if_fail (g_utf8_validate (pattern, -1, NULL), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
+ _thunar_return_val_if_fail (g_utf8_validate (pattern, -1, NULL), NULL);
/* compile the pattern */
pspec = g_pattern_spec_new (pattern);
@@ -2175,7 +2176,7 @@ thunar_list_model_get_statusbar_text (ThunarListModel *store,
gint n;
Row *row;
- g_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), NULL);
if (selected_items == NULL)
{
diff --git a/thunar/thunar-location-bar.c b/thunar/thunar-location-bar.c
index 70e0f1249c07e8f294e1e091a2a38b2c23fc7b28..ad89ebc772333f837fdd5d008c66b46d33f75fdc 100644
--- a/thunar/thunar-location-bar.c
+++ b/thunar/thunar-location-bar.c
@@ -22,6 +22,7 @@
#endif
#include <thunar/thunar-location-bar.h>
+#include <thunar/thunar-private.h>
@@ -81,7 +82,7 @@ gboolean
thunar_location_bar_accept_focus (ThunarLocationBar *location_bar,
const gchar *initial_text)
{
- g_return_val_if_fail (THUNAR_IS_LOCATION_BAR (location_bar), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BAR (location_bar), FALSE);
return (*THUNAR_LOCATION_BAR_GET_IFACE (location_bar)->accept_focus) (location_bar, initial_text);
}
@@ -102,6 +103,6 @@ thunar_location_bar_accept_focus (ThunarLocationBar *location_bar,
gboolean
thunar_location_bar_is_standalone (ThunarLocationBar *location_bar)
{
- g_return_val_if_fail (THUNAR_IS_LOCATION_BAR (location_bar), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BAR (location_bar), FALSE);
return (*THUNAR_LOCATION_BAR_GET_IFACE (location_bar)->is_standalone) (location_bar);
}
diff --git a/thunar/thunar-location-button.c b/thunar/thunar-location-button.c
index f4f8263fa8dd583aa9be2650668ca328ef7e3de0..f9645268dd9abbb14bbbc5217da8cc4b1f3428f1 100644
--- a/thunar/thunar-location-button.c
+++ b/thunar/thunar-location-button.c
@@ -33,6 +33,7 @@
#include <thunar/thunar-icon-factory.h>
#include <thunar/thunar-location-button.h>
#include <thunar/thunar-pango-extensions.h>
+#include <thunar/thunar-private.h>
@@ -433,9 +434,9 @@ thunar_location_button_file_changed (ThunarLocationButton *location_button,
GdkPixbuf *icon;
gint size;
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
- g_return_if_fail (location_button->file == file);
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
+ _thunar_return_if_fail (location_button->file == file);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* determine the icon size for buttons */
gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &size, &size);
@@ -469,9 +470,9 @@ static void
thunar_location_button_file_destroy (ThunarLocationButton *location_button,
ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
- g_return_if_fail (location_button->file == file);
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
+ _thunar_return_if_fail (location_button->file == file);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* the file is gone, no need to keep the button around anymore */
gtk_widget_destroy (GTK_WIDGET (location_button));
@@ -484,7 +485,7 @@ thunar_location_button_button_press_event (GtkWidget *button,
GdkEventButton *event,
ThunarLocationButton *location_button)
{
- g_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
/* check if we can handle the button event */
if (G_UNLIKELY (event->button == 2))
@@ -511,7 +512,7 @@ thunar_location_button_button_release_event (GtkWidget *button,
{
ThunarApplication *application;
- g_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
/* reset inconsistent button state after releasing the middle-mouse-button */
if (G_UNLIKELY (event->button == 2))
@@ -544,8 +545,8 @@ thunar_location_button_drag_drop (GtkWidget *button,
{
GdkAtom target;
- g_return_val_if_fail (GTK_IS_WIDGET (button), FALSE);
- g_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
+ _thunar_return_val_if_fail (GTK_IS_WIDGET (button), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
/* determine the DnD target and see if we can handle it */
target = gtk_drag_dest_find_target (button, context, NULL);
@@ -577,8 +578,8 @@ thunar_location_button_drag_data_get (GtkWidget *button,
gchar *uri_string;
GList path_list;
- g_return_if_fail (GTK_IS_WIDGET (button));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
+ _thunar_return_if_fail (GTK_IS_WIDGET (button));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
/* verify that we have a valid file */
if (G_LIKELY (location_button->file != NULL))
@@ -656,8 +657,8 @@ thunar_location_button_drag_leave (GtkWidget *button,
guint time,
ThunarLocationButton *location_button)
{
- g_return_if_fail (GTK_IS_BUTTON (button));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
+ _thunar_return_if_fail (GTK_IS_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
/* reset the file icon state to default appearance */
if (G_LIKELY (location_button->file_icon_state != THUNAR_FILE_ICON_STATE_DEFAULT))
@@ -699,8 +700,8 @@ thunar_location_button_drag_motion (GtkWidget *button,
GdkAtom target;
gint delay;
- g_return_val_if_fail (GTK_IS_BUTTON (button), FALSE);
- g_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
+ _thunar_return_val_if_fail (GTK_IS_BUTTON (button), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
/* schedule the enter timeout if not already done */
if (G_UNLIKELY (location_button->enter_timeout_id < 0))
@@ -811,7 +812,7 @@ thunar_location_button_new (void)
gboolean
thunar_location_button_get_active (ThunarLocationButton *location_button)
{
- g_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), FALSE);
return location_button->active;
}
@@ -828,7 +829,7 @@ void
thunar_location_button_set_active (ThunarLocationButton *location_button,
gboolean active)
{
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
/* apply the new state */
location_button->active = active;
@@ -853,7 +854,7 @@ thunar_location_button_set_active (ThunarLocationButton *location_button,
ThunarFile*
thunar_location_button_get_file (ThunarLocationButton *location_button)
{
- g_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button), NULL);
return location_button->file;
}
@@ -870,8 +871,8 @@ void
thunar_location_button_set_file (ThunarLocationButton *location_button,
ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
- g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
+ _thunar_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
/* check if we already use that file */
if (G_UNLIKELY (location_button->file == file))
@@ -925,7 +926,7 @@ thunar_location_button_set_file (ThunarLocationButton *location_button,
void
thunar_location_button_clicked (ThunarLocationButton *location_button)
{
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (location_button));
g_signal_emit (G_OBJECT (location_button), location_button_signals[CLICKED], 0);
}
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 75db7dd4c1d5724a0c2abde1f704a58e50ec0f53..25d4e3fd606652c577212362a4edcf4f9de2d283 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -31,6 +31,7 @@
#include <thunar/thunar-location-button.h>
#include <thunar/thunar-location-buttons.h>
#include <thunar/thunar-location-buttons-ui.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-properties-dialog.h>
@@ -349,7 +350,7 @@ thunar_location_buttons_finalize (GObject *object)
{
ThunarLocationButtons *buttons = THUNAR_LOCATION_BUTTONS (object);
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* disconnect from the selected files and the UI manager */
thunar_component_set_selected_files (THUNAR_COMPONENT (buttons), NULL);
@@ -498,7 +499,7 @@ thunar_location_buttons_set_current_directory (ThunarNavigator *navigator,
GtkWidget *button;
GList *lp;
- g_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
+ _thunar_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
/* verify that we're not already using the new directory */
if (G_UNLIKELY (buttons->current_directory == current_directory))
@@ -857,8 +858,8 @@ thunar_location_buttons_forall (GtkContainer *container,
GtkWidget *child;
GList *lp;
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
- g_return_if_fail (callback != NULL);
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (callback != NULL);
for (lp = buttons->list; lp != NULL; )
{
@@ -1121,8 +1122,8 @@ thunar_location_buttons_clicked (ThunarLocationButton *button,
ThunarFile *directory;
GList *lp;
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (button));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* determine the directory associated with the clicked button */
directory = thunar_location_button_get_file (button);
@@ -1183,8 +1184,8 @@ thunar_location_buttons_context_menu (ThunarLocationButton *button,
guint signal_id;
guint merge_id;
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTON (button));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* determine the file for the button */
file = thunar_location_button_get_file (button);
@@ -1349,8 +1350,8 @@ thunar_location_buttons_action_create_folder (GtkAction *action,
GList path_list;
gchar *name;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* determine the directory for the action */
directory = g_object_get_data (G_OBJECT (action), "thunar-file");
@@ -1394,8 +1395,8 @@ thunar_location_buttons_action_empty_trash (GtkAction *action,
{
ThunarApplication *application;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* launch the operation */
application = thunar_application_get ();
@@ -1411,8 +1412,8 @@ thunar_location_buttons_action_down_folder (GtkAction *action,
{
GList *lp;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* lookup the active button */
for (lp = buttons->list; lp != NULL; lp = lp->next)
@@ -1437,8 +1438,8 @@ thunar_location_buttons_action_open (GtkAction *action,
{
ThunarLocationButton *button;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* just emit "clicked" for the button associated with the action */
button = g_object_get_data (G_OBJECT (action), "thunar-location-button");
@@ -1455,8 +1456,8 @@ thunar_location_buttons_action_open_in_new_window (GtkAction *action
ThunarApplication *application;
ThunarFile *directory;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* determine the directory for the action */
directory = g_object_get_data (G_OBJECT (action), "thunar-file");
@@ -1478,8 +1479,8 @@ thunar_location_buttons_action_paste_files_here (GtkAction *action,
ThunarClipboardManager *clipboard;
ThunarFile *directory;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* determine the directory for the action */
directory = g_object_get_data (G_OBJECT (action), "thunar-file");
@@ -1502,8 +1503,8 @@ thunar_location_buttons_action_properties (GtkAction *action,
GtkWidget *toplevel;
GtkWidget *dialog;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_BUTTONS (buttons));
/* determine the directory for the action */
directory = g_object_get_data (G_OBJECT (action), "thunar-file");
diff --git a/thunar/thunar-location-dialog.c b/thunar/thunar-location-dialog.c
index aff30559887bd42177b4f21ccbfef7b72c97c892..0d3a71f089d0ce3cc1aa3a4a900a0cd8ac33082f 100644
--- a/thunar/thunar-location-dialog.c
+++ b/thunar/thunar-location-dialog.c
@@ -23,6 +23,7 @@
#include <thunar/thunar-location-dialog.h>
#include <thunar/thunar-path-entry.h>
+#include <thunar/thunar-private.h>
@@ -151,7 +152,7 @@ thunar_location_dialog_new (void)
ThunarFile*
thunar_location_dialog_get_selected_file (ThunarLocationDialog *location_dialog)
{
- g_return_val_if_fail (THUNAR_IS_LOCATION_DIALOG (location_dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_LOCATION_DIALOG (location_dialog), NULL);
return thunar_path_entry_get_current_file (THUNAR_PATH_ENTRY (location_dialog->entry));
}
@@ -168,8 +169,8 @@ void
thunar_location_dialog_set_selected_file (ThunarLocationDialog *location_dialog,
ThunarFile *selected_file)
{
- g_return_if_fail (THUNAR_IS_LOCATION_DIALOG (location_dialog));
- g_return_if_fail (selected_file == NULL || THUNAR_IS_FILE (selected_file));
+ _thunar_return_if_fail (THUNAR_IS_LOCATION_DIALOG (location_dialog));
+ _thunar_return_if_fail (selected_file == NULL || THUNAR_IS_FILE (selected_file));
thunar_path_entry_set_current_file (THUNAR_PATH_ENTRY (location_dialog->entry), selected_file);
}
diff --git a/thunar/thunar-metafile.c b/thunar/thunar-metafile.c
index 9085df34bb61bf8d2ac122556b266158517acbac..bff93da33a8f0d1890340a7961199f61add35ca9 100644
--- a/thunar/thunar-metafile.c
+++ b/thunar/thunar-metafile.c
@@ -40,6 +40,7 @@
#include <tdb/tdb.h>
#include <thunar/thunar-metafile.h>
+#include <thunar/thunar-private.h>
@@ -255,9 +256,9 @@ thunar_metafile_fetch (ThunarMetafile *metafile,
gssize key_size;
gchar key_path[THUNAR_VFS_PATH_MAXSTRLEN];
- g_return_val_if_fail (THUNAR_IS_METAFILE (metafile), NULL);
- g_return_val_if_fail (key < THUNAR_METAFILE_N_KEYS, NULL);
- g_return_val_if_fail (path != NULL, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_METAFILE (metafile), NULL);
+ _thunar_return_val_if_fail (key < THUNAR_METAFILE_N_KEYS, NULL);
+ _thunar_return_val_if_fail (path != NULL, NULL);
/* check if the database handle is available */
if (G_UNLIKELY (metafile->context == NULL))
@@ -344,11 +345,11 @@ thunar_metafile_store (ThunarMetafile *metafile,
gchar *bp;
gchar key_path[THUNAR_VFS_PATH_MAXSTRLEN];
- g_return_if_fail (THUNAR_IS_METAFILE (metafile));
- g_return_if_fail (key < THUNAR_METAFILE_N_KEYS);
- g_return_if_fail (default_value != NULL);
- g_return_if_fail (value != NULL);
- g_return_if_fail (path != NULL);
+ _thunar_return_if_fail (THUNAR_IS_METAFILE (metafile));
+ _thunar_return_if_fail (key < THUNAR_METAFILE_N_KEYS);
+ _thunar_return_if_fail (default_value != NULL);
+ _thunar_return_if_fail (value != NULL);
+ _thunar_return_if_fail (path != NULL);
/* check if the database handle is available */
if (G_UNLIKELY (metafile->context == NULL))
@@ -403,8 +404,8 @@ thunar_metafile_store (ThunarMetafile *metafile,
;
/* verify the vx pointer */
- g_assert (vx <= vend);
- g_assert (vx > vp);
+ _thunar_assert (vx <= vend);
+ _thunar_assert (vx > vp);
/* check if we should copy the entry */
if (*vp != key)
@@ -415,8 +416,8 @@ thunar_metafile_store (ThunarMetafile *metafile,
}
/* verify the buffer space */
- g_assert (bp <= buffer + value_data.dsize + value_size);
- g_assert ((bp - buffer) % sizeof (guint32) == 0);
+ _thunar_assert (bp <= buffer + value_data.dsize + value_size);
+ _thunar_assert ((bp - buffer) % sizeof (guint32) == 0);
/* release the previous value set */
free (value_data.dptr);
diff --git a/thunar/thunar-navigator.c b/thunar/thunar-navigator.c
index 9e15b85099b2947fc29b8ab38ab4477c7ed2a0d0..9e6f4f285de37229f0819924ce83515154e2cdd0 100644
--- a/thunar/thunar-navigator.c
+++ b/thunar/thunar-navigator.c
@@ -22,6 +22,7 @@
#endif
#include <thunar/thunar-navigator.h>
+#include <thunar/thunar-private.h>
@@ -154,7 +155,7 @@ thunar_navigator_class_init (gpointer klass)
ThunarFile*
thunar_navigator_get_current_directory (ThunarNavigator *navigator)
{
- g_return_val_if_fail (THUNAR_IS_NAVIGATOR (navigator), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_NAVIGATOR (navigator), NULL);
return THUNAR_NAVIGATOR_GET_IFACE (navigator)->get_current_directory (navigator);
}
@@ -172,8 +173,8 @@ void
thunar_navigator_set_current_directory (ThunarNavigator *navigator,
ThunarFile *current_directory)
{
- g_return_if_fail (THUNAR_IS_NAVIGATOR (navigator));
- g_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
+ _thunar_return_if_fail (THUNAR_IS_NAVIGATOR (navigator));
+ _thunar_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
THUNAR_NAVIGATOR_GET_IFACE (navigator)->set_current_directory (navigator, current_directory);
}
@@ -200,9 +201,9 @@ void
thunar_navigator_change_directory (ThunarNavigator *navigator,
ThunarFile *directory)
{
- g_return_if_fail (THUNAR_IS_NAVIGATOR (navigator));
- g_return_if_fail (THUNAR_IS_FILE (directory));
- g_return_if_fail (thunar_file_is_directory (directory));
+ _thunar_return_if_fail (THUNAR_IS_NAVIGATOR (navigator));
+ _thunar_return_if_fail (THUNAR_IS_FILE (directory));
+ _thunar_return_if_fail (thunar_file_is_directory (directory));
g_signal_emit (G_OBJECT (navigator), navigator_signals[CHANGE_DIRECTORY], 0, directory);
}
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index 83fe7656465f8dc7f29b2e5774b6cb2996e47711..b714f4625557b45892c55b2ac33e21705880354f 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -41,6 +41,7 @@
#include <thunar/thunar-icon-renderer.h>
#include <thunar/thunar-list-model.h>
#include <thunar/thunar-path-entry.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-util.h>
@@ -1233,10 +1234,10 @@ thunar_path_entry_parse (ThunarPathEntry *path_entry,
gchar *filename;
gchar *path;
- g_return_val_if_fail (THUNAR_IS_PATH_ENTRY (path_entry), FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- g_return_val_if_fail (folder_part != NULL, FALSE);
- g_return_val_if_fail (file_part != NULL, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_PATH_ENTRY (path_entry), FALSE);
+ _thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ _thunar_return_val_if_fail (folder_part != NULL, FALSE);
+ _thunar_return_val_if_fail (file_part != NULL, FALSE);
/* expand the filename */
filename = thunar_vfs_expand_filename (gtk_entry_get_text (GTK_ENTRY (path_entry)), error);
@@ -1362,7 +1363,7 @@ thunar_path_entry_new (void)
ThunarFile*
thunar_path_entry_get_current_file (ThunarPathEntry *path_entry)
{
- g_return_val_if_fail (THUNAR_IS_PATH_ENTRY (path_entry), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_PATH_ENTRY (path_entry), NULL);
return path_entry->current_file;
}
@@ -1383,8 +1384,8 @@ thunar_path_entry_set_current_file (ThunarPathEntry *path_entry,
ThunarVfsPath *path;
gchar *text;
- g_return_if_fail (THUNAR_IS_PATH_ENTRY (path_entry));
- g_return_if_fail (current_file == NULL || THUNAR_IS_FILE (current_file));
+ _thunar_return_if_fail (THUNAR_IS_PATH_ENTRY (path_entry));
+ _thunar_return_if_fail (current_file == NULL || THUNAR_IS_FILE (current_file));
path = (current_file != NULL) ? thunar_file_get_path (current_file) : NULL;
if (G_UNLIKELY (path == NULL))
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 40719a82b4b380e5b8a871dcb9d554c43789adfc..cbb4422ddb3c904b6ef524e200cfbf8362e486d3 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -38,8 +38,11 @@
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-permissions-chooser.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-stock.h>
+
+
/* Use native strlcpy() if available */
#if defined(HAVE_STRLCPY)
#define g_strlcpy(dst, src, size) (strlcpy ((dst), (src), (size)))
@@ -672,8 +675,8 @@ thunar_permissions_chooser_change_group (ThunarPermissionsChooser *chooser,
GError *error = NULL;
gint response;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_IS_FILE (chooser->file));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (THUNAR_IS_FILE (chooser->file));
/* check if we should operate recursively */
if (thunar_file_is_directory (chooser->file))
@@ -725,8 +728,8 @@ thunar_permissions_chooser_change_mode (ThunarPermissionsChooser *chooser,
GError *error = NULL;
gint response;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_IS_FILE (chooser->file));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (THUNAR_IS_FILE (chooser->file));
/* check if we should operate recursively */
if (thunar_file_is_directory (chooser->file))
@@ -776,8 +779,8 @@ thunar_permissions_chooser_access_changed (ThunarPermissionsChooser *chooser,
ThunarVfsFileMode dir_mode;
guint n;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (GTK_IS_COMBO_BOX (combo));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (GTK_IS_COMBO_BOX (combo));
/* verify that we have a valid file */
if (G_UNLIKELY (chooser->file == NULL))
@@ -851,9 +854,9 @@ thunar_permissions_chooser_file_changed (ThunarPermissionsChooser *chooser,
gchar buffer[1024];
guint n;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (chooser->file == file);
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (chooser->file == file);
/* allocate a new store for the group combo box */
g_signal_handlers_block_by_func (G_OBJECT (chooser->group_combo), thunar_permissions_chooser_group_changed, chooser);
@@ -989,9 +992,9 @@ thunar_permissions_chooser_group_changed (ThunarPermissionsChooser *chooser,
GtkTreeModel *model;
GtkTreeIter iter;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (chooser->group_combo == combo);
- g_return_if_fail (GTK_IS_COMBO_BOX (combo));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (chooser->group_combo == combo);
+ _thunar_return_if_fail (GTK_IS_COMBO_BOX (combo));
/* verify that we have a valid file */
if (G_UNLIKELY (chooser->file == NULL))
@@ -1019,9 +1022,9 @@ thunar_permissions_chooser_program_toggled (ThunarPermissionsChooser *chooser,
{
ThunarVfsFileMode mode;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (chooser->program_button == button);
- g_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (chooser->program_button == button);
+ _thunar_return_if_fail (GTK_IS_TOGGLE_BUTTON (button));
/* verify that we have a valid file */
if (G_UNLIKELY (chooser->file == NULL))
@@ -1047,9 +1050,9 @@ thunar_permissions_chooser_fixperm_clicked (ThunarPermissionsChooser *chooser,
GError *error = NULL;
gint response;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (chooser->fixperm_button == button);
- g_return_if_fail (GTK_IS_BUTTON (button));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (chooser->fixperm_button == button);
+ _thunar_return_if_fail (GTK_IS_BUTTON (button));
/* verify that we have a valid file */
if (G_UNLIKELY (chooser->file == NULL))
@@ -1114,10 +1117,10 @@ thunar_permissions_chooser_job_ask (ThunarPermissionsChooser *chooser,
{
GtkWidget *toplevel;
- g_return_val_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser), THUNAR_VFS_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (chooser->job == job, THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (chooser->job == job, THUNAR_VFS_JOB_RESPONSE_CANCEL);
/* be sure to display the progress bar prior to opening the question dialog */
gtk_widget_show_now (chooser->job_progress);
@@ -1136,7 +1139,7 @@ thunar_permissions_chooser_job_ask (ThunarPermissionsChooser *chooser,
static void
thunar_permissions_chooser_job_cancel (ThunarPermissionsChooser *chooser)
{
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
/* verify that we have a job to cancel */
if (G_UNLIKELY (chooser->job == NULL))
@@ -1166,10 +1169,10 @@ thunar_permissions_chooser_job_error (ThunarPermissionsChooser *chooser,
{
GtkWidget *toplevel;
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (error != NULL && error->message != NULL);
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (chooser->job == job);
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (error != NULL && error->message != NULL);
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (chooser->job == job);
/* be sure to display the progress bar prior to opening the error dialog */
gtk_widget_show_now (chooser->job_progress);
@@ -1189,9 +1192,9 @@ static void
thunar_permissions_chooser_job_finished (ThunarPermissionsChooser *chooser,
ThunarVfsJob *job)
{
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (chooser->job == job);
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (chooser->job == job);
/* we can just use job_cancel(), since the job is already done */
thunar_permissions_chooser_job_cancel (chooser);
@@ -1204,9 +1207,9 @@ thunar_permissions_chooser_job_percent (ThunarPermissionsChooser *chooser,
gdouble percent,
ThunarVfsJob *job)
{
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (chooser->job == job);
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (chooser->job == job);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (chooser->job_progress), percent / 100.0);
gtk_widget_show (chooser->job_progress);
@@ -1219,9 +1222,9 @@ thunar_permissions_chooser_job_start (ThunarPermissionsChooser *chooser,
ThunarVfsJob *job,
gboolean recursive)
{
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (chooser->job == NULL);
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (chooser->job == NULL);
/* take a reference to the job and connect signals */
chooser->job = g_object_ref (G_OBJECT (job));
@@ -1288,7 +1291,7 @@ thunar_permissions_chooser_new (void)
ThunarFile*
thunar_permissions_chooser_get_file (ThunarPermissionsChooser *chooser)
{
- g_return_val_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser), NULL);
return chooser->file;
}
@@ -1305,8 +1308,8 @@ void
thunar_permissions_chooser_set_file (ThunarPermissionsChooser *chooser,
ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
- g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_PERMISSIONS_CHOOSER (chooser));
+ _thunar_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
/* check if we already use that file */
if (G_UNLIKELY (chooser->file == file))
diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c
index 23a81b9ee08091f883458bb4251a305529ddc0df..4792e3ca140b5a744498acc2630b120a326e4477 100644
--- a/thunar/thunar-preferences.c
+++ b/thunar/thunar-preferences.c
@@ -42,6 +42,7 @@
#include <thunar/thunar-enum-types.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
@@ -784,10 +785,10 @@ thunar_preferences_monitor (ThunarVfsMonitor *monitor,
{
ThunarPreferences *preferences = THUNAR_PREFERENCES (user_data);
- g_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
- g_return_if_fail (THUNAR_VFS_IS_MONITOR (monitor));
- g_return_if_fail (preferences->monitor == monitor);
- g_return_if_fail (preferences->handle == handle);
+ _thunar_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
+ _thunar_return_if_fail (THUNAR_VFS_IS_MONITOR (monitor));
+ _thunar_return_if_fail (preferences->monitor == monitor);
+ _thunar_return_if_fail (preferences->handle == handle);
/* schedule a reload whenever the file is created/changed */
if (event == THUNAR_VFS_MONITOR_EVENT_CHANGED || event == THUNAR_VFS_MONITOR_EVENT_CREATED)
diff --git a/thunar/thunar-private.h b/thunar/thunar-private.h
index 70faa47d4f2b913597a4ef13ba5f51f623eecbb7..880633f2aaebb24df930266fa383bcbb639798a2 100644
--- a/thunar/thunar-private.h
+++ b/thunar/thunar-private.h
@@ -25,6 +25,19 @@
G_BEGIN_DECLS;
+/* support macros for debugging */
+#ifdef G_ENABLE_DEBUG
+#define _thunar_assert(expr) g_assert (expr)
+#define _thunar_assert_not_reached() g_assert_not_reached ()
+#define _thunar_return_if_fail(expr) g_return_if_fail (expr)
+#define _thunar_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
+#else
+#define _thunar_assert(expr) G_STMT_START{ (void)0; }G_STMT_END
+#define _thunar_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
+#define _thunar_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
+#define _thunar_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
+#endif
+
/* support macros for the slice allocator */
#if GLIB_CHECK_VERSION(2,10,0)
#define _thunar_slice_alloc(block_size) (g_slice_alloc ((block_size)))
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index a2265c8a962d96bc9f8ce9fe485a24493fafa47f..0a621a28ec5e65c170850320fe7e0759522e88dc 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -24,6 +24,7 @@
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-pango-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-progress-dialog.h>
@@ -268,10 +269,10 @@ thunar_progress_dialog_ask (ThunarProgressDialog *dialog,
ThunarVfsJobResponse choices,
ThunarVfsJob *job)
{
- g_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), THUNAR_VFS_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
- g_return_val_if_fail (dialog->job == job, THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (g_utf8_validate (message, -1, NULL), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (THUNAR_VFS_IS_JOB (job), THUNAR_VFS_JOB_RESPONSE_CANCEL);
+ _thunar_return_val_if_fail (dialog->job == job, THUNAR_VFS_JOB_RESPONSE_CANCEL);
/* be sure to display the progress dialog prior to opening the question dialog */
gtk_widget_show_now (GTK_WIDGET (dialog));
@@ -287,10 +288,10 @@ thunar_progress_dialog_error (ThunarProgressDialog *dialog,
GError *error,
ThunarVfsJob *job)
{
- g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
- g_return_if_fail (error != NULL && error->message != NULL);
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (dialog->job == job);
+ _thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
+ _thunar_return_if_fail (error != NULL && error->message != NULL);
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (dialog->job == job);
/* be sure to display the progress dialog prior to opening the error dialog */
gtk_widget_show_now (GTK_WIDGET (dialog));
@@ -305,9 +306,9 @@ static void
thunar_progress_dialog_finished (ThunarProgressDialog *dialog,
ThunarVfsJob *job)
{
- g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (dialog->job == job);
+ _thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (dialog->job == job);
gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
}
@@ -319,10 +320,10 @@ thunar_progress_dialog_info_message (ThunarProgressDialog *dialog,
const gchar *message,
ThunarVfsJob *job)
{
- g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
- g_return_if_fail (g_utf8_validate (message, -1, NULL));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (dialog->job == job);
+ _thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
+ _thunar_return_if_fail (g_utf8_validate (message, -1, NULL));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (dialog->job == job);
gtk_label_set_text (GTK_LABEL (dialog->progress_label), message);
}
@@ -349,10 +350,10 @@ thunar_progress_dialog_percent (ThunarProgressDialog *dialog,
gulong elapsed_time;
gchar text[512];
- g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
- g_return_if_fail (percent >= 0.0 && percent <= 100.0);
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (dialog->job == job);
+ _thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
+ _thunar_return_if_fail (percent >= 0.0 && percent <= 100.0);
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (dialog->job == job);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (dialog->progress_bar), percent / 100.0);
@@ -451,7 +452,7 @@ thunar_progress_dialog_new (void)
GtkWidget*
thunar_progress_dialog_new_with_job (ThunarVfsJob *job)
{
- g_return_val_if_fail (job == NULL || THUNAR_VFS_IS_JOB (job), NULL);
+ _thunar_return_val_if_fail (job == NULL || THUNAR_VFS_IS_JOB (job), NULL);
return g_object_new (THUNAR_TYPE_PROGRESS_DIALOG, "job", job, NULL);
}
@@ -469,7 +470,7 @@ thunar_progress_dialog_new_with_job (ThunarVfsJob *job)
ThunarVfsJob*
thunar_progress_dialog_get_job (ThunarProgressDialog *dialog)
{
- g_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog), NULL);
return dialog->job;
}
@@ -486,8 +487,8 @@ void
thunar_progress_dialog_set_job (ThunarProgressDialog *dialog,
ThunarVfsJob *job)
{
- g_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
- g_return_if_fail (job == NULL || THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (THUNAR_IS_PROGRESS_DIALOG (dialog));
+ _thunar_return_if_fail (job == NULL || THUNAR_VFS_IS_JOB (job));
/* check if we're already on that job */
if (G_UNLIKELY (dialog->job == job))
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index ee53f876b5e077bd6b78221ea1b096268bc505db..17c24b1638e4bdc91eb766be5c3c1e4b6e2f1207 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -39,6 +39,7 @@
#include <thunar/thunar-marshal.h>
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-permissions-chooser.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-properties-dialog.h>
#include <thunar/thunar-size-label.h>
@@ -712,8 +713,8 @@ thunar_properties_dialog_update (ThunarPropertiesDialog *dialog)
gchar *size_string;
gchar *str;
- g_return_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog));
- g_return_if_fail (THUNAR_IS_FILE (dialog->file));
+ _thunar_return_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog));
+ _thunar_return_if_fail (THUNAR_IS_FILE (dialog->file));
icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (dialog)));
icon_factory = thunar_icon_factory_get_for_icon_theme (icon_theme);
@@ -956,7 +957,7 @@ thunar_properties_dialog_new (void)
ThunarFile*
thunar_properties_dialog_get_file (ThunarPropertiesDialog *dialog)
{
- g_return_val_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog), NULL);
return dialog->file;
}
@@ -974,8 +975,8 @@ void
thunar_properties_dialog_set_file (ThunarPropertiesDialog *dialog,
ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog));
- g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog));
+ _thunar_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
/* check if we already display that file */
if (G_UNLIKELY (dialog->file == file))
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 95826a648f2661ccd60d6ea94ea6d8a15cc13773..8ebcb54e0f302f03b2ec490839173f93cd60b4c2 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -35,6 +35,7 @@
#include <thunar/thunar-icon-factory.h>
#include <thunar/thunar-icon-renderer.h>
#include <thunar/thunar-launcher.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-properties-dialog.h>
#include <thunar/thunar-renamer-dialog.h>
#include <thunar/thunar-renamer-dialog-ui.h>
@@ -858,7 +859,7 @@ thunar_renamer_dialog_context_menu (ThunarRenamerDialog *renamer_dialog,
guint id;
gint renamer_merge_id = 0;
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* grab an additional reference on the dialog */
g_object_ref (G_OBJECT (renamer_dialog));
@@ -955,7 +956,7 @@ thunar_renamer_dialog_help (ThunarRenamerDialog *renamer_dialog)
GdkScreen *screen;
GError *error = NULL;
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* check if the active renamer provides a help URL */
renamer = thunar_renamer_model_get_renamer (renamer_dialog->model);
@@ -1006,7 +1007,7 @@ thunar_renamer_dialog_save (ThunarRenamerDialog *renamer_dialog)
GEnumValue *value;
XfceRc *rc;
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* try to open the config handle for writing */
rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "Thunar/renamerrc", FALSE);
@@ -1076,8 +1077,8 @@ thunar_renamer_dialog_action_add_files (GtkAction *action,
GSList *lp;
gchar *uri;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* allocate the file chooser */
chooser = gtk_file_chooser_dialog_new (_("Select files to rename"),
@@ -1179,8 +1180,8 @@ thunar_renamer_dialog_action_remove_files (GtkAction *action,
GList *rows;
GList *lp;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* determine the selected rows in the view */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (renamer_dialog->tree_view));
@@ -1219,8 +1220,8 @@ static void
thunar_renamer_dialog_action_clear (GtkAction *action,
ThunarRenamerDialog *renamer_dialog)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* just clear the list of files in the model */
thunar_renamer_model_clear (renamer_dialog->model);
@@ -1232,8 +1233,8 @@ static void
thunar_renamer_dialog_action_about (GtkAction *action,
ThunarRenamerDialog *renamer_dialog)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* just popup the about dialog */
thunar_dialogs_show_about (GTK_WINDOW (renamer_dialog), _("Bulk Rename"),
@@ -1249,8 +1250,8 @@ thunar_renamer_dialog_action_properties (GtkAction *action,
{
GtkWidget *dialog;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* verify that we have exactly one file selected */
if (G_LIKELY (g_list_length (renamer_dialog->selected_files) == 1))
@@ -1275,8 +1276,8 @@ thunar_renamer_dialog_button_press_event (GtkWidget *tree_view,
GtkTreeSelection *selection;
GtkTreePath *path;
- g_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
- g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
+ _thunar_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
/* determine the tree selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
@@ -1336,8 +1337,8 @@ thunar_renamer_dialog_drag_data_received (GtkWidget *tree_view,
GList *path_list;
GList *lp;
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
- g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
/* we only accept text/uri-list drops with format 8 and atleast one byte of data */
if (info == TARGET_TEXT_URI_LIST && selection_data->format == 8 && selection_data->length > 0)
@@ -1379,8 +1380,8 @@ thunar_renamer_dialog_drag_leave (GtkWidget *tree_view,
guint time,
ThunarRenamerDialog *renamer_dialog)
{
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
- g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
/* disable the highlighting */
if (renamer_dialog->drag_highlighted)
@@ -1405,8 +1406,8 @@ thunar_renamer_dialog_drag_motion (GtkWidget *tree_view,
{
GdkAtom target;
- g_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
- g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
+ _thunar_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
/* determine the drop target */
target = gtk_drag_dest_find_target (tree_view, context, NULL);
@@ -1453,8 +1454,8 @@ thunar_renamer_dialog_notify_page (GtkNotebook *notebook,
GtkWidget *renamer;
gint page;
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
- g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_NOTEBOOK (notebook));
/* determine the currently active renamer page */
page = gtk_notebook_get_current_page (notebook);
@@ -1474,8 +1475,8 @@ static gboolean
thunar_renamer_dialog_popup_menu (GtkWidget *tree_view,
ThunarRenamerDialog *renamer_dialog)
{
- g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
- g_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
+ _thunar_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
/* popup the context menu */
thunar_renamer_dialog_context_menu (renamer_dialog, 0, gtk_get_current_event_time ());
@@ -1494,8 +1495,8 @@ thunar_renamer_dialog_row_activated (GtkTreeView *tree_view,
{
GtkAction *action;
- g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* just activate the "open" action */
action = thunar_gtk_ui_manager_get_action_by_name (renamer_dialog->ui_manager, "open");
@@ -1517,8 +1518,8 @@ thunar_renamer_dialog_selection_changed (GtkTreeSelection *selection,
GList *lp;
gint n_selected_files = 0;
- g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (GTK_IS_TREE_SELECTION (selection));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* release the list of previously selected files */
thunarx_file_info_list_free (renamer_dialog->selected_files);
@@ -1592,7 +1593,7 @@ thunar_renamer_dialog_new (void)
ThunarFile*
thunar_renamer_dialog_get_current_directory (ThunarRenamerDialog *renamer_dialog)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), NULL);
return renamer_dialog->current_directory;
}
@@ -1612,8 +1613,8 @@ void
thunar_renamer_dialog_set_current_directory (ThunarRenamerDialog *renamer_dialog,
ThunarFile *current_directory)
{
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
- g_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
/* check if we already use that directory */
if (G_UNLIKELY (renamer_dialog->current_directory == current_directory))
@@ -1648,7 +1649,7 @@ thunar_renamer_dialog_set_current_directory (ThunarRenamerDialog *renamer_dialog
GList*
thunar_renamer_dialog_get_selected_files (ThunarRenamerDialog *renamer_dialog)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), NULL);
return renamer_dialog->selected_files;
}
@@ -1667,7 +1668,7 @@ thunar_renamer_dialog_get_selected_files (ThunarRenamerDialog *renamer_dialog)
gboolean
thunar_renamer_dialog_get_standalone (ThunarRenamerDialog *renamer_dialog)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
return renamer_dialog->standalone;
}
@@ -1686,7 +1687,7 @@ void
thunar_renamer_dialog_set_standalone (ThunarRenamerDialog *renamer_dialog,
gboolean standalone)
{
- g_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog));
/* normalize the value */
standalone = !!standalone;
@@ -1749,7 +1750,7 @@ thunar_show_renamer_dialog (gpointer parent,
GtkWidget *window = NULL;
GList *lp;
- g_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+ _thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
/* determine the screen for the dialog */
if (G_UNLIKELY (parent == NULL))
diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
index 2edc5c968d7681edc88603e35c05d69dcb618ba6..f742e5945fb6fdad5b564e88f4f16a5bf9575c01 100644
--- a/thunar/thunar-renamer-model.c
+++ b/thunar/thunar-renamer-model.c
@@ -424,7 +424,7 @@ thunar_renamer_model_get_column_type (GtkTreeModel *tree_model,
return G_TYPE_STRING;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
return G_TYPE_INVALID;
}
}
@@ -439,8 +439,8 @@ thunar_renamer_model_get_iter (GtkTreeModel *tree_model,
ThunarRenamerModel *renamer_model = THUNAR_RENAMER_MODEL (tree_model);
GList *lp;
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
- g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
+ _thunar_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
lp = g_list_nth (renamer_model->items, gtk_tree_path_get_indices (path)[0]);
if (G_LIKELY (lp != NULL))
@@ -462,8 +462,8 @@ thunar_renamer_model_get_path (GtkTreeModel *tree_model,
ThunarRenamerModel *renamer_model = THUNAR_RENAMER_MODEL (tree_model);
gint index;
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), NULL);
- g_return_val_if_fail (iter->stamp == renamer_model->stamp, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), NULL);
+ _thunar_return_val_if_fail (iter->stamp == renamer_model->stamp, NULL);
/* determine the index of the item */
index = g_list_position (renamer_model->items, iter->user_data);
@@ -482,10 +482,9 @@ thunar_renamer_model_get_value (GtkTreeModel *tree_model,
GValue *value)
{
ThunarRenamerModelItem *item;
- ThunarRenamerModel *renamer_model = THUNAR_RENAMER_MODEL (tree_model);
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
- g_return_if_fail (iter->stamp == renamer_model->stamp);
+ _thunar_return_if_fail (iter->stamp == THUNAR_RENAMER_MODEL (tree_model)->stamp);
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (tree_model));
item = g_list_nth_data (iter->user_data, 0);
@@ -517,7 +516,7 @@ thunar_renamer_model_get_value (GtkTreeModel *tree_model,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
break;
}
}
@@ -528,8 +527,8 @@ static gboolean
thunar_renamer_model_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (tree_model), FALSE);
- g_return_val_if_fail (iter->stamp == THUNAR_RENAMER_MODEL (tree_model)->stamp, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (tree_model), FALSE);
+ _thunar_return_val_if_fail (iter->stamp == THUNAR_RENAMER_MODEL (tree_model)->stamp, FALSE);
iter->user_data = g_list_next (iter->user_data);
return (iter->user_data != NULL);
@@ -544,7 +543,7 @@ thunar_renamer_model_iter_children (GtkTreeModel *tree_model,
{
ThunarRenamerModel *renamer_model = THUNAR_RENAMER_MODEL (tree_model);
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
if (G_LIKELY (parent == NULL && renamer_model->items != NULL))
{
@@ -584,7 +583,7 @@ thunar_renamer_model_iter_nth_child (GtkTreeModel *tree_model,
{
ThunarRenamerModel *renamer_model = THUNAR_RENAMER_MODEL (tree_model);
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
if (G_LIKELY (parent != NULL))
{
@@ -618,10 +617,10 @@ thunar_renamer_model_file_changed (ThunarRenamerModel *renamer_model,
GtkTreeIter iter;
GList *lp;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
- g_return_if_fail (renamer_model->file_monitor == file_monitor);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (renamer_model->file_monitor == file_monitor);
/* check if we have that file */
for (lp = renamer_model->items; lp != NULL; lp = lp->next)
@@ -670,10 +669,10 @@ thunar_renamer_model_file_destroyed (ThunarRenamerModel *renamer_model,
GList *lp;
gint index;
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
- g_return_if_fail (renamer_model->file_monitor == file_monitor);
- g_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (renamer_model->file_monitor == file_monitor);
+ _thunar_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* check if we have that file */
for (lp = renamer_model->items; lp != NULL; lp = lp->next)
@@ -871,7 +870,7 @@ thunar_renamer_model_process_item (ThunarRenamerModel *renamer_model,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
break;
}
}
@@ -1046,7 +1045,7 @@ thunar_renamer_model_get_can_rename (ThunarRenamerModel *renamer_model)
gboolean can_rename = FALSE;
GList *lp;
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
if (G_LIKELY (renamer_model->renamer != NULL && !renamer_model->frozen && renamer_model->update_idle_id < 0))
{
@@ -1081,7 +1080,7 @@ thunar_renamer_model_get_can_rename (ThunarRenamerModel *renamer_model)
gboolean
thunar_renamer_model_get_frozen (ThunarRenamerModel *renamer_model)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
return renamer_model->frozen;
}
@@ -1100,7 +1099,7 @@ void
thunar_renamer_model_set_frozen (ThunarRenamerModel *renamer_model,
gboolean frozen)
{
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
/* normalize the value */
frozen = !!frozen;
@@ -1146,7 +1145,7 @@ thunar_renamer_model_set_frozen (ThunarRenamerModel *renamer_model,
ThunarRenamerMode
thunar_renamer_model_get_mode (ThunarRenamerModel *renamer_model)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), THUNAR_RENAMER_MODE_NAME);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), THUNAR_RENAMER_MODE_NAME);
return renamer_model->mode;
}
@@ -1164,7 +1163,7 @@ void
thunar_renamer_model_set_mode (ThunarRenamerModel *renamer_model,
ThunarRenamerMode mode)
{
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
/* check if we're already in the requested mode */
if (G_UNLIKELY (renamer_model->mode == mode))
@@ -1194,7 +1193,7 @@ thunar_renamer_model_set_mode (ThunarRenamerModel *renamer_model,
ThunarxRenamer*
thunar_renamer_model_get_renamer (ThunarRenamerModel *renamer_model)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), NULL);
return renamer_model->renamer;
}
@@ -1212,8 +1211,8 @@ void
thunar_renamer_model_set_renamer (ThunarRenamerModel *renamer_model,
ThunarxRenamer *renamer)
{
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
- g_return_if_fail (renamer == NULL || THUNARX_IS_RENAMER (renamer));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (renamer == NULL || THUNARX_IS_RENAMER (renamer));
/* verify that we do not already use the renamer */
if (G_UNLIKELY (renamer_model->renamer == renamer))
@@ -1261,8 +1260,8 @@ thunar_renamer_model_append (ThunarRenamerModel *renamer_model,
GtkTreeIter iter;
GList *lp;
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* check if we already have that file */
for (lp = renamer_model->items; lp != NULL; lp = lp->next)
@@ -1300,7 +1299,7 @@ thunar_renamer_model_append (ThunarRenamerModel *renamer_model,
void
thunar_renamer_model_clear (ThunarRenamerModel *renamer_model)
{
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
/* grab an additional reference on the model */
g_object_ref (G_OBJECT (renamer_model));
@@ -1339,8 +1338,8 @@ thunar_renamer_model_remove (ThunarRenamerModel *renamer_model,
{
GList *lp;
- g_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
- g_return_if_fail (gtk_tree_path_get_depth (path) == 1);
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model));
+ _thunar_return_if_fail (gtk_tree_path_get_depth (path) == 1);
/* determine the list item for the path and verify that its valid */
lp = g_list_nth (renamer_model->items, gtk_tree_path_get_indices (path)[0]);
diff --git a/thunar/thunar-renamer-pair.c b/thunar/thunar-renamer-pair.c
index 2002817af5b22b9c1d826ddf49bb24a3b2b4cbce..4982c1d46b5d04dcec5eb8da67d40d34949a8869 100644
--- a/thunar/thunar-renamer-pair.c
+++ b/thunar/thunar-renamer-pair.c
@@ -63,8 +63,8 @@ thunar_renamer_pair_new (ThunarFile *file,
{
ThunarRenamerPair *renamer_pair;
- g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
- g_return_val_if_fail (g_utf8_validate (name, -1, NULL), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+ _thunar_return_val_if_fail (g_utf8_validate (name, -1, NULL), NULL);
renamer_pair = _thunar_slice_new (ThunarRenamerPair);
renamer_pair->file = g_object_ref (G_OBJECT (file));
@@ -90,7 +90,7 @@ thunar_renamer_pair_new (ThunarFile *file,
ThunarRenamerPair*
thunar_renamer_pair_copy (ThunarRenamerPair *renamer_pair)
{
- g_return_val_if_fail (renamer_pair != NULL, NULL);
+ _thunar_return_val_if_fail (renamer_pair != NULL, NULL);
return thunar_renamer_pair_new (renamer_pair->file, renamer_pair->name);
}
diff --git a/thunar/thunar-renamer-progress.c b/thunar/thunar-renamer-progress.c
index 12d9d5009fcf2a640536c07147a65c258d6b4ad4..7631ef91d11aa14c3ae7ee7e960269bc8b4a3a25 100644
--- a/thunar/thunar-renamer-progress.c
+++ b/thunar/thunar-renamer-progress.c
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <thunar/thunar-private.h>
#include <thunar/thunar-renamer-progress.h>
@@ -135,8 +136,8 @@ thunar_renamer_progress_finalize (GObject *object)
ThunarRenamerProgress *renamer_progress = THUNAR_RENAMER_PROGRESS (object);
/* make sure we're not finalized while the main loop is active */
- g_assert (renamer_progress->next_idle_id < 0);
- g_assert (renamer_progress->next_idle_loop == NULL);
+ _thunar_assert (renamer_progress->next_idle_id < 0);
+ _thunar_assert (renamer_progress->next_idle_loop == NULL);
/* release the pairs */
thunar_renamer_pair_list_free (renamer_progress->pairs_done);
@@ -326,7 +327,7 @@ thunar_renamer_progress_new (void)
void
thunar_renamer_progress_cancel (ThunarRenamerProgress *renamer_progress)
{
- g_return_if_fail (THUNAR_IS_RENAMER_PROGRESS (renamer_progress));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_PROGRESS (renamer_progress));
/* exit the internal main loop (if any) */
if (G_UNLIKELY (renamer_progress->next_idle_loop != NULL))
@@ -346,7 +347,7 @@ thunar_renamer_progress_cancel (ThunarRenamerProgress *renamer_progress)
gboolean
thunar_renamer_progress_running (ThunarRenamerProgress *renamer_progress)
{
- g_return_val_if_fail (THUNAR_IS_RENAMER_PROGRESS (renamer_progress), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_RENAMER_PROGRESS (renamer_progress), FALSE);
return (renamer_progress->next_idle_loop != NULL);
}
@@ -367,7 +368,7 @@ void
thunar_renamer_progress_run (ThunarRenamerProgress *renamer_progress,
GList *pairs)
{
- g_return_if_fail (THUNAR_IS_RENAMER_PROGRESS (renamer_progress));
+ _thunar_return_if_fail (THUNAR_IS_RENAMER_PROGRESS (renamer_progress));
/* make sure we're not already renaming */
if (G_UNLIKELY (renamer_progress->next_idle_id >= 0 || renamer_progress->next_idle_loop != NULL))
diff --git a/thunar/thunar-sendto-model.c b/thunar/thunar-sendto-model.c
index 48ab2b732fd0697b436e11550761f613027c711b..d3863d524d6e06ae014ab850ca9d16c668341215 100644
--- a/thunar/thunar-sendto-model.c
+++ b/thunar/thunar-sendto-model.c
@@ -28,6 +28,7 @@
#include <string.h>
#endif
+#include <thunar/thunar-private.h>
#include <thunar/thunar-sendto-model.h>
@@ -266,7 +267,7 @@ thunar_sendto_model_get_matching (ThunarSendtoModel *sendto_model,
GList *fp;
guint n;
- g_return_val_if_fail (THUNAR_IS_SENDTO_MODEL (sendto_model), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_SENDTO_MODEL (sendto_model), NULL);
/* no files, no sendto actions */
if (G_UNLIKELY (files == NULL))
diff --git a/thunar/thunar-session-client.c b/thunar/thunar-session-client.c
index 1c57ad92199a6ed37e5a457cb742ae7e63b7224c..695948a435cc8ae76f0657eadad6bef427cde0f7 100644
--- a/thunar/thunar-session-client.c
+++ b/thunar/thunar-session-client.c
@@ -38,6 +38,7 @@
#include <thunar/thunar-application.h>
#include <thunar/thunar-ice.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-session-client.h>
@@ -351,8 +352,8 @@ static void
thunar_session_client_die (SmcConn connection,
ThunarSessionClient *session_client)
{
- g_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
- g_return_if_fail (session_client->connection == connection);
+ _thunar_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
+ _thunar_return_if_fail (session_client->connection == connection);
/* terminate the application */
gtk_main_quit ();
@@ -364,8 +365,8 @@ static void
thunar_session_client_save_complete (SmcConn connection,
ThunarSessionClient *session_client)
{
- g_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
- g_return_if_fail (session_client->connection == connection);
+ _thunar_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
+ _thunar_return_if_fail (session_client->connection == connection);
}
@@ -386,8 +387,8 @@ thunar_session_client_save_yourself (SmcConn connection,
gchar *uri;
FILE *fp;
- g_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
- g_return_if_fail (session_client->connection == connection);
+ _thunar_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
+ _thunar_return_if_fail (session_client->connection == connection);
/* check if we should save our current state */
if (save_type == SmSaveLocal || save_type == SmSaveBoth)
@@ -435,8 +436,8 @@ static void
thunar_session_client_shutdown_cancelled (SmcConn connection,
ThunarSessionClient *session_client)
{
- g_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
- g_return_if_fail (session_client->connection == connection);
+ _thunar_return_if_fail (THUNAR_IS_SESSION_CLIENT (session_client));
+ _thunar_return_if_fail (session_client->connection == connection);
}
#endif /* !HAVE_LIBSM */
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index 3c74953187ceb3ef0c01f4c63422381f61177320..dcc417c35e91167f2e6382017bc04d21f0dd5836 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -352,7 +352,7 @@ thunar_shortcuts_model_finalize (GObject *object)
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (object);
GList *lp;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
/* free all shortcuts */
g_list_foreach (model->shortcuts, (GFunc) thunar_shortcut_free, model);
@@ -417,7 +417,7 @@ thunar_shortcuts_model_get_column_type (GtkTreeModel *tree_model,
return G_TYPE_BOOLEAN;
}
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
return G_TYPE_INVALID;
}
@@ -431,8 +431,8 @@ thunar_shortcuts_model_get_iter (GtkTreeModel *tree_model,
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (tree_model);
GList *lp;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
- g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
/* determine the list item for the path */
lp = g_list_nth (model->shortcuts, gtk_tree_path_get_indices (path)[0]);
@@ -455,8 +455,8 @@ thunar_shortcuts_model_get_path (GtkTreeModel *tree_model,
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (tree_model);
gint index;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), NULL);
- g_return_val_if_fail (iter->stamp == model->stamp, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), NULL);
+ _thunar_return_val_if_fail (iter->stamp == model->stamp, NULL);
/* lookup the list item in the shortcuts list */
index = g_list_position (model->shortcuts, iter->user_data);
@@ -474,12 +474,11 @@ thunar_shortcuts_model_get_value (GtkTreeModel *tree_model,
gint column,
GValue *value)
{
- ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (tree_model);
- ThunarShortcut *shortcut;
- ThunarFile *file;
+ ThunarShortcut *shortcut;
+ ThunarFile *file;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (iter->stamp == model->stamp);
+ _thunar_return_if_fail (iter->stamp == THUNAR_SHORTCUTS_MODEL (tree_model)->stamp);
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (tree_model));
/* determine the shortcut for the list item */
shortcut = THUNAR_SHORTCUT (((GList *) iter->user_data)->data);
@@ -529,7 +528,7 @@ thunar_shortcuts_model_get_value (GtkTreeModel *tree_model,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
}
}
@@ -539,8 +538,8 @@ static gboolean
thunar_shortcuts_model_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (tree_model), FALSE);
- g_return_val_if_fail (iter->stamp == THUNAR_SHORTCUTS_MODEL (tree_model)->stamp, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (tree_model), FALSE);
+ _thunar_return_val_if_fail (iter->stamp == THUNAR_SHORTCUTS_MODEL (tree_model)->stamp, FALSE);
iter->user_data = g_list_next (iter->user_data);
return (iter->user_data != NULL);
@@ -555,7 +554,7 @@ thunar_shortcuts_model_iter_children (GtkTreeModel *tree_model,
{
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (tree_model);
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
if (G_LIKELY (parent == NULL && model->shortcuts != NULL))
{
@@ -584,7 +583,7 @@ thunar_shortcuts_model_iter_n_children (GtkTreeModel *tree_model,
{
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (tree_model);
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
return (iter == NULL) ? g_list_length (model->shortcuts) : 0;
}
@@ -599,7 +598,7 @@ thunar_shortcuts_model_iter_nth_child (GtkTreeModel *tree_model,
{
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (tree_model);
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
if (G_LIKELY (parent != NULL))
{
@@ -630,8 +629,8 @@ thunar_shortcuts_model_row_draggable (GtkTreeDragSource *source,
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (source);
ThunarShortcut *shortcut;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
- g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
/* lookup the ThunarShortcut for the path */
shortcut = g_list_nth_data (model->shortcuts, gtk_tree_path_get_indices (path)[0]);
@@ -675,11 +674,11 @@ thunar_shortcuts_model_add_shortcut (ThunarShortcutsModel *model,
{
GtkTreeIter iter;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (shortcut->file == NULL || THUNAR_IS_FILE (shortcut->file));
- g_return_if_fail (gtk_tree_path_get_depth (path) > 0);
- g_return_if_fail (gtk_tree_path_get_indices (path)[0] >= 0);
- g_return_if_fail (gtk_tree_path_get_indices (path)[0] <= g_list_length (model->shortcuts));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (shortcut->file == NULL || THUNAR_IS_FILE (shortcut->file));
+ _thunar_return_if_fail (gtk_tree_path_get_depth (path) > 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] >= 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] <= g_list_length (model->shortcuts));
/* we want to stay informed about changes to the file */
if (G_LIKELY (shortcut->file != NULL))
@@ -825,9 +824,9 @@ thunar_shortcuts_model_monitor (ThunarVfsMonitor *monitor,
GList *lp;
gint index;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (model->monitor == monitor);
- g_return_if_fail (model->handle == handle);
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (model->monitor == monitor);
+ _thunar_return_if_fail (model->handle == handle);
/* drop all existing user-defined shortcuts from the model */
for (index = 0, lp = model->shortcuts; lp != NULL; )
@@ -875,7 +874,7 @@ thunar_shortcuts_model_save (ThunarShortcutsModel *model)
FILE *fp;
gint fd;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
/* open a temporary file for writing */
tmp_path = xfce_get_homefile (".gtk-bookmarks.XXXXXX", NULL);
@@ -933,8 +932,8 @@ thunar_shortcuts_model_file_changed (ThunarFile *file,
GList *lp;
gint index;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
/* check if the file still refers to a directory, else we cannot keep
* it on the shortcuts list, and so we'll treat it like the file
@@ -971,8 +970,8 @@ thunar_shortcuts_model_file_destroy (ThunarFile *file,
ThunarShortcut *shortcut = NULL;
GList *lp;
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
/* lookup the shortcut matching the file */
for (lp = model->shortcuts; lp != NULL; lp = lp->next)
@@ -983,8 +982,8 @@ thunar_shortcuts_model_file_destroy (ThunarFile *file,
}
/* verify that we actually found a shortcut */
- g_assert (lp != NULL);
- g_assert (THUNAR_IS_FILE (shortcut->file));
+ _thunar_assert (lp != NULL);
+ _thunar_assert (THUNAR_IS_FILE (shortcut->file));
/* drop the shortcut from the model */
thunar_shortcuts_model_remove_shortcut (model, shortcut);
@@ -1002,8 +1001,8 @@ thunar_shortcuts_model_volume_changed (ThunarVfsVolume *volume,
GList *lp;
gint index;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
/* check if the volume is on the hidden list */
lp = g_list_find (model->hidden_volumes, volume);
@@ -1046,8 +1045,8 @@ thunar_shortcuts_model_volume_changed (ThunarVfsVolume *volume,
}
/* verify that we actually found the shortcut */
- g_assert (shortcut != NULL);
- g_assert (shortcut->volume == volume);
+ _thunar_assert (shortcut != NULL);
+ _thunar_assert (shortcut->volume == volume);
/* check if we need to hide the volume now */
if (!thunar_vfs_volume_is_present (volume) || !thunar_vfs_volume_is_removable (volume))
@@ -1087,9 +1086,9 @@ thunar_shortcuts_model_volumes_added (ThunarVfsVolumeManager *volume_manager,
{
GList *lp;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (model->volume_manager == volume_manager);
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (model->volume_manager == volume_manager);
/* process all newly added volumes */
for (lp = volumes; lp != NULL; lp = lp->next)
@@ -1118,9 +1117,9 @@ thunar_shortcuts_model_volumes_removed (ThunarVfsVolumeManager *volume_manager,
GList *hp;
GList *lp;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (model->volume_manager == volume_manager);
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (model->volume_manager == volume_manager);
/* process all removed volumes */
for (lp = volumes; lp != NULL; lp = lp->next)
@@ -1144,8 +1143,8 @@ thunar_shortcuts_model_volumes_removed (ThunarVfsVolumeManager *volume_manager,
break;
/* something is broken if we don't have a shortcut here */
- g_assert (hp != NULL);
- g_assert (THUNAR_SHORTCUT (hp->data)->volume == lp->data);
+ _thunar_assert (hp != NULL);
+ _thunar_assert (THUNAR_SHORTCUT (hp->data)->volume == lp->data);
/* drop the shortcut from the model */
thunar_shortcuts_model_remove_shortcut (model, hp->data);
@@ -1240,9 +1239,9 @@ thunar_shortcuts_model_iter_for_file (ThunarShortcutsModel *model,
ThunarVfsPath *mount_point;
GList *lp;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
- g_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- g_return_val_if_fail (iter != NULL, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
+ _thunar_return_val_if_fail (iter != NULL, FALSE);
for (lp = model->shortcuts; lp != NULL; lp = lp->next)
{
@@ -1291,8 +1290,8 @@ thunar_shortcuts_model_drop_possible (ThunarShortcutsModel *model,
{
ThunarShortcut *shortcut;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
- g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
/* determine the list item for the path */
shortcut = g_list_nth_data (model->shortcuts, gtk_tree_path_get_indices (path)[0]);
@@ -1324,11 +1323,11 @@ thunar_shortcuts_model_add (ThunarShortcutsModel *model,
ThunarShortcut *shortcut;
GList *lp;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (gtk_tree_path_get_depth (dst_path) > 0);
- g_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] >= 0);
- g_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] <= g_list_length (model->shortcuts));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (gtk_tree_path_get_depth (dst_path) > 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] >= 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] <= g_list_length (model->shortcuts));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* verify that the file is not already in use as shortcut */
for (lp = model->shortcuts; lp != NULL; lp = lp->next)
@@ -1371,12 +1370,12 @@ thunar_shortcuts_model_move (ThunarShortcutsModel *model,
gint index_dst;
gint index;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (gtk_tree_path_get_depth (src_path) > 0);
- g_return_if_fail (gtk_tree_path_get_depth (dst_path) > 0);
- g_return_if_fail (gtk_tree_path_get_indices (src_path)[0] >= 0);
- g_return_if_fail (gtk_tree_path_get_indices (src_path)[0] < g_list_length (model->shortcuts));
- g_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] > 0);
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (gtk_tree_path_get_depth (src_path) > 0);
+ _thunar_return_if_fail (gtk_tree_path_get_depth (dst_path) > 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (src_path)[0] >= 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (src_path)[0] < g_list_length (model->shortcuts));
+ _thunar_return_if_fail (gtk_tree_path_get_indices (dst_path)[0] > 0);
index_src = gtk_tree_path_get_indices (src_path)[0];
index_dst = gtk_tree_path_get_indices (dst_path)[0];
@@ -1407,7 +1406,7 @@ thunar_shortcuts_model_move (ThunarShortcutsModel *model,
for (; index < index_src; ++index, lp = lp->next)
;
- g_assert (index == index_src);
+ _thunar_assert (index == index_src);
shortcut = THUNAR_SHORTCUT (lp->data);
@@ -1417,7 +1416,7 @@ thunar_shortcuts_model_move (ThunarShortcutsModel *model,
order[index] = index - 1;
}
- g_assert (index == index_dst);
+ _thunar_assert (index == index_dst);
lp->data = shortcut;
order[index] = index_src;
@@ -1455,17 +1454,17 @@ thunar_shortcuts_model_remove (ThunarShortcutsModel *model,
{
ThunarShortcut *shortcut;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (gtk_tree_path_get_depth (path) > 0);
- g_return_if_fail (gtk_tree_path_get_indices (path)[0] >= 0);
- g_return_if_fail (gtk_tree_path_get_indices (path)[0] < g_list_length (model->shortcuts));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (gtk_tree_path_get_depth (path) > 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] >= 0);
+ _thunar_return_if_fail (gtk_tree_path_get_indices (path)[0] < g_list_length (model->shortcuts));
/* lookup the shortcut for the given path */
shortcut = g_list_nth_data (model->shortcuts, gtk_tree_path_get_indices (path)[0]);
/* verify that the shortcut is removable */
- g_assert (shortcut->type == THUNAR_SHORTCUT_USER_DEFINED);
- g_assert (THUNAR_IS_FILE (shortcut->file));
+ _thunar_assert (shortcut->type == THUNAR_SHORTCUT_USER_DEFINED);
+ _thunar_assert (THUNAR_IS_FILE (shortcut->file));
/* remove the shortcut (using the file destroy handler) */
thunar_shortcuts_model_file_destroy (shortcut->file, model);
@@ -1494,17 +1493,17 @@ thunar_shortcuts_model_rename (ThunarShortcutsModel *model,
ThunarShortcut *shortcut;
GtkTreePath *path;
- g_return_if_fail (name == NULL || g_utf8_validate (name, -1, NULL));
- g_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- g_return_if_fail (iter->stamp == model->stamp);
- g_return_if_fail (iter->user_data != NULL);
+ _thunar_return_if_fail (name == NULL || g_utf8_validate (name, -1, NULL));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
+ _thunar_return_if_fail (iter->stamp == model->stamp);
+ _thunar_return_if_fail (iter->user_data != NULL);
/* lookup the shortcut for the given path */
shortcut = THUNAR_SHORTCUT (((GList *) iter->user_data)->data);
/* verify the shortcut */
- g_assert (shortcut->type == THUNAR_SHORTCUT_USER_DEFINED);
- g_assert (THUNAR_IS_FILE (shortcut->file));
+ _thunar_assert (shortcut->type == THUNAR_SHORTCUT_USER_DEFINED);
+ _thunar_assert (THUNAR_IS_FILE (shortcut->file));
/* perform the rename */
if (G_UNLIKELY (shortcut->name != NULL))
diff --git a/thunar/thunar-shortcuts-pane.c b/thunar/thunar-shortcuts-pane.c
index d8b9cf86c867134bb06c50b4df576e84629b57ae..0eec0df84f283a84f6046d7da361e3e1fbad7acf 100644
--- a/thunar/thunar-shortcuts-pane.c
+++ b/thunar/thunar-shortcuts-pane.c
@@ -22,6 +22,7 @@
#endif
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-shortcuts-model.h>
#include <thunar/thunar-shortcuts-pane.h>
#include <thunar/thunar-shortcuts-pane-ui.h>
@@ -491,8 +492,8 @@ thunar_shortcuts_pane_action_shortcuts_add (GtkAction *action,
GtkTreePath *path;
GList *lp;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_SHORTCUTS_PANE (shortcuts_pane));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_PANE (shortcuts_pane));
/* determine the shortcuts model for the view */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (shortcuts_pane->view));
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index a9df1294c20d2936198324e16f4d8ba86910502f..896a458a6ba1b953bbead99ccea7922d51161040 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -28,6 +28,7 @@
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-dnd.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-shortcuts-icon-renderer.h>
#include <thunar/thunar-shortcuts-model.h>
#include <thunar/thunar-shortcuts-view.h>
@@ -445,7 +446,7 @@ thunar_shortcuts_view_drag_data_received (GtkWidget *widget,
ThunarFile *file;
gboolean succeed = FALSE;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
/* check if we don't already know the drop data */
if (G_LIKELY (!view->drop_data_ready))
@@ -546,7 +547,7 @@ thunar_shortcuts_view_drag_drop (GtkWidget *widget,
GtkTreeIter iter;
GdkAtom target;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
/* determine the drop target */
target = gtk_drag_dest_find_target (widget, context, NULL);
@@ -1089,8 +1090,8 @@ thunar_shortcuts_view_compute_drop_position (ThunarShortcutsView *view,
GtkTreePath *path;
gint n_rows;
- g_return_val_if_fail (gtk_tree_view_get_model (GTK_TREE_VIEW (view)) != NULL, NULL);
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), NULL);
+ _thunar_return_val_if_fail (gtk_tree_view_get_model (GTK_TREE_VIEW (view)) != NULL, NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), NULL);
/* query the number of rows in the model */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (view));
@@ -1188,7 +1189,7 @@ thunar_shortcuts_view_open (ThunarShortcutsView *view)
GtkTreeIter iter;
ThunarFile *file;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
/* make sure to mount the volume first (if it's a volume) */
if (!thunar_shortcuts_view_mount (view))
@@ -1220,7 +1221,7 @@ thunar_shortcuts_view_open_in_new_window (ThunarShortcutsView *view)
GtkTreeIter iter;
ThunarFile *file;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
/* make sure to mount the volume first (if it's a volume) */
if (!thunar_shortcuts_view_mount (view))
@@ -1250,7 +1251,7 @@ thunar_shortcuts_view_empty_trash (ThunarShortcutsView *view)
{
ThunarApplication *application;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
/* empty the trash bin (asking the user first) */
application = thunar_application_get ();
@@ -1271,7 +1272,7 @@ thunar_shortcuts_view_eject (ThunarShortcutsView *view)
gboolean result = TRUE;
GError *error = NULL;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
/* determine the selected item */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
@@ -1314,7 +1315,7 @@ thunar_shortcuts_view_mount (ThunarShortcutsView *view)
gboolean result = TRUE;
GError *error = NULL;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
/* determine the selected item */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
@@ -1361,7 +1362,7 @@ thunar_shortcuts_view_unmount (ThunarShortcutsView *view)
gboolean result = TRUE;
GError *error = NULL;
- g_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view), FALSE);
/* determine the selected item */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
@@ -1445,8 +1446,8 @@ thunar_shortcuts_view_select_by_file (ThunarShortcutsView *view,
GtkTreeModel *model;
GtkTreeIter iter;
- g_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* clear the selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
diff --git a/thunar/thunar-side-pane.c b/thunar/thunar-side-pane.c
index 800d35420e8a199b483e3814ba5bb72726780aee..21d1618faccb1233a42514509654076284d45cc5 100644
--- a/thunar/thunar-side-pane.c
+++ b/thunar/thunar-side-pane.c
@@ -21,6 +21,7 @@
#include <config.h>
#endif
+#include <thunar/thunar-private.h>
#include <thunar/thunar-side-pane.h>
@@ -91,7 +92,7 @@ thunar_side_pane_class_init (gpointer klass)
gboolean
thunar_side_pane_get_show_hidden (ThunarSidePane *side_pane)
{
- g_return_val_if_fail (THUNAR_IS_SIDE_PANE (side_pane), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SIDE_PANE (side_pane), FALSE);
return (*THUNAR_SIDE_PANE_GET_IFACE (side_pane)->get_show_hidden) (side_pane);
}
@@ -109,7 +110,7 @@ void
thunar_side_pane_set_show_hidden (ThunarSidePane *side_pane,
gboolean show_hidden)
{
- g_return_if_fail (THUNAR_IS_SIDE_PANE (side_pane));
+ _thunar_return_if_fail (THUNAR_IS_SIDE_PANE (side_pane));
(*THUNAR_SIDE_PANE_GET_IFACE (side_pane)->set_show_hidden) (side_pane, show_hidden);
}
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index 84a893aeea5273d92fe1a0eed826ca675454e3a4..8f6aab99af8125d2370bf7dcbb97fc965d9be664 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -29,6 +29,7 @@
#endif
#include <thunar/thunar-gtk-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-size-label.h>
#include <thunar/thunar-throbber.h>
@@ -270,8 +271,8 @@ thunar_size_label_button_press_event (GtkWidget *ebox,
GdkEventButton *event,
ThunarSizeLabel *size_label)
{
- g_return_val_if_fail (GTK_IS_EVENT_BOX (ebox), FALSE);
- g_return_val_if_fail (THUNAR_IS_SIZE_LABEL (size_label), FALSE);
+ _thunar_return_val_if_fail (GTK_IS_EVENT_BOX (ebox), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SIZE_LABEL (size_label), FALSE);
/* left button press on the throbber cancels the calculation */
if (G_LIKELY (event->button == 1))
@@ -361,9 +362,9 @@ thunar_size_label_file_changed (ThunarFile *file,
gchar *size_string;
gchar *text;
- g_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
- g_return_if_fail (size_label->file == file);
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
+ _thunar_return_if_fail (size_label->file == file);
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* be sure to cancel the animate timer */
if (G_UNLIKELY (size_label->animate_timer_id >= 0))
@@ -440,9 +441,9 @@ thunar_size_label_error (ThunarVfsJob *job,
const GError *error,
ThunarSizeLabel *size_label)
{
- g_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (size_label->job == job);
+ _thunar_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (size_label->job == job);
/* setup the error text as label */
gtk_label_set_text (GTK_LABEL (size_label->label), error->message);
@@ -454,9 +455,9 @@ static void
thunar_size_label_finished (ThunarVfsJob *job,
ThunarSizeLabel *size_label)
{
- g_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (size_label->job == job);
+ _thunar_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (size_label->job == job);
/* be sure to cancel the animate timer */
if (G_UNLIKELY (size_label->animate_timer_id >= 0))
@@ -486,9 +487,9 @@ thunar_size_label_status_ready (ThunarVfsJob *job,
gchar *text;
guint n;
- g_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (size_label->job == job);
+ _thunar_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (size_label->job == job);
/* check if the animate timer is already running */
if (G_UNLIKELY (size_label->animate_timer_id < 0))
@@ -563,7 +564,7 @@ thunar_size_label_new (void)
ThunarFile*
thunar_size_label_get_file (ThunarSizeLabel *size_label)
{
- g_return_val_if_fail (THUNAR_IS_SIZE_LABEL (size_label), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_SIZE_LABEL (size_label), NULL);
return size_label->file;
}
@@ -580,8 +581,8 @@ void
thunar_size_label_set_file (ThunarSizeLabel *size_label,
ThunarFile *file)
{
- g_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
- g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_SIZE_LABEL (size_label));
+ _thunar_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
/* check if we already display that file */
if (G_UNLIKELY (size_label->file == file))
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index ee0248a0f5e265724f6dedb56b630a30e5441add..0c9da85f9f44f6fdc31fe6271f45fbb8a7b80406 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -38,6 +38,7 @@
#include <thunar/thunar-gobject-extensions.h>
#include <thunar/thunar-icon-renderer.h>
#include <thunar/thunar-marshal.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-properties-dialog.h>
#include <thunar/thunar-renamer-dialog.h>
#include <thunar/thunar-standard-view.h>
@@ -722,10 +723,10 @@ thunar_standard_view_finalize (GObject *object)
ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (object);
/* some safety checks */
- g_assert (standard_view->loading_binding == NULL);
- g_assert (standard_view->icon_factory == NULL);
- g_assert (standard_view->ui_manager == NULL);
- g_assert (standard_view->clipboard == NULL);
+ _thunar_assert (standard_view->loading_binding == NULL);
+ _thunar_assert (standard_view->icon_factory == NULL);
+ _thunar_assert (standard_view->ui_manager == NULL);
+ _thunar_assert (standard_view->clipboard == NULL);
/* release the scroll_to_file reference (if any) */
if (G_UNLIKELY (standard_view->priv->scroll_to_file != NULL))
@@ -1101,7 +1102,7 @@ thunar_standard_view_get_current_directory (ThunarNavigator *navigator)
ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (navigator);
ThunarFolder *folder;
- g_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), NULL);
/* try to determine the current folder from the model */
folder = thunar_list_model_get_folder (standard_view->model);
@@ -1121,8 +1122,8 @@ thunar_standard_view_set_current_directory (ThunarNavigator *navigator,
ThunarFolder *folder;
gboolean trashed;
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- g_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
/* disconnect any previous "loading" binding */
if (G_LIKELY (standard_view->loading_binding != NULL))
@@ -1247,7 +1248,7 @@ thunar_standard_view_get_statusbar_text (ThunarView *view)
ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (view);
GList *items;
- g_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), NULL);
/* generate the statusbar text on-demand */
if (standard_view->statusbar_text == NULL)
@@ -1447,7 +1448,7 @@ thunar_standard_view_scroll_to_file (ThunarView *view,
static gboolean
thunar_standard_view_delete_selected_files (ThunarStandardView *standard_view)
{
- g_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
/* just emit the "activate" signal on the "delete" action */
gtk_action_activate (standard_view->priv->action_delete);
@@ -1699,7 +1700,7 @@ thunar_standard_view_merge_custom_actions (ThunarStandardView *standard_view,
static void
thunar_standard_view_update_statusbar_text (ThunarStandardView *standard_view)
{
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* clear the current status text (will be recalculated on-demand) */
g_free (standard_view->statusbar_text);
@@ -1722,8 +1723,8 @@ thunar_standard_view_action_create_empty_file (GtkAction *action,
GList path_list;
gchar *name;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* lookup "text/plain" mime info */
mime_database = thunar_vfs_mime_database_get_default ();
@@ -1773,8 +1774,8 @@ thunar_standard_view_action_create_folder (GtkAction *action,
GList path_list;
gchar *name;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* lookup "inode/directory" mime info */
mime_database = thunar_vfs_mime_database_get_default ();
@@ -1825,9 +1826,9 @@ thunar_standard_view_action_create_template (GtkAction *action,
gchar *title;
gchar *name;
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (info != NULL);
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (info != NULL);
/* generate a title for the create dialog */
title = g_strdup_printf (_("Create Document from template \"%s\""), info->display_name);
@@ -1878,8 +1879,8 @@ thunar_standard_view_action_properties (GtkAction *action,
GtkWidget *toplevel;
GtkWidget *dialog;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* check if no files are currently selected */
if (standard_view->selected_files == NULL)
@@ -1917,9 +1918,9 @@ static void
thunar_standard_view_action_cut (GtkAction *action,
ThunarStandardView *standard_view)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (standard_view->clipboard));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (standard_view->clipboard));
thunar_clipboard_manager_cut_files (standard_view->clipboard, standard_view->selected_files);
}
@@ -1930,9 +1931,9 @@ static void
thunar_standard_view_action_copy (GtkAction *action,
ThunarStandardView *standard_view)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- g_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (standard_view->clipboard));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_CLIPBOARD_MANAGER (standard_view->clipboard));
thunar_clipboard_manager_copy_files (standard_view->clipboard, standard_view->selected_files);
}
@@ -1945,8 +1946,8 @@ thunar_standard_view_action_paste (GtkAction *action,
{
ThunarFile *current_directory;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
if (G_LIKELY (current_directory != NULL))
@@ -1964,8 +1965,8 @@ thunar_standard_view_action_delete (GtkAction *action,
{
ThunarApplication *application;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* delete the selected files */
application = thunar_application_get ();
@@ -1981,8 +1982,8 @@ thunar_standard_view_action_paste_into_folder (GtkAction *action,
{
ThunarFile *file;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the first selected file and verify that it's a folder */
file = g_list_nth_data (standard_view->selected_files, 0);
@@ -1996,8 +1997,8 @@ static void
thunar_standard_view_action_select_all_files (GtkAction *action,
ThunarStandardView *standard_view)
{
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* grab the focus to the view */
gtk_widget_grab_focus (GTK_WIDGET (standard_view));
@@ -2021,8 +2022,8 @@ thunar_standard_view_action_select_by_pattern (GtkAction *action,
GList *lp;
gint response;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
window = gtk_widget_get_toplevel (GTK_WIDGET (standard_view));
dialog = gtk_dialog_new_with_buttons (_("Select by Pattern"),
@@ -2077,8 +2078,8 @@ thunar_standard_view_action_duplicate (GtkAction *action,
GClosure *new_files_closure;
GList *selected_paths;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the file for the current directory */
current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
@@ -2114,8 +2115,8 @@ thunar_standard_view_action_make_link (GtkAction *action,
GClosure *new_files_closure;
GList *selected_paths;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the file for the current directory */
current_directory = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
@@ -2163,8 +2164,8 @@ thunar_standard_view_action_rename (GtkAction *action,
gchar *title;
gint response;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* start renaming if we have exactly one selected file */
if (G_LIKELY (standard_view->selected_files != NULL && standard_view->selected_files->next == NULL))
@@ -2285,8 +2286,8 @@ thunar_standard_view_action_restore (GtkAction *action,
{
ThunarApplication *application;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* restore the selected files */
application = thunar_application_get ();
@@ -2327,8 +2328,8 @@ thunar_standard_view_new_files (ThunarVfsJob *job,
GList *file_list = NULL;
GList *lp;
- g_return_if_fail (THUNAR_VFS_IS_JOB (job));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_VFS_IS_JOB (job));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* verify that we have a non-empty path_list */
if (G_UNLIKELY (path_list == NULL))
@@ -2363,8 +2364,8 @@ thunar_standard_view_button_release_event (GtkWidget *view,
GdkEventButton *event,
ThunarStandardView *standard_view)
{
- g_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
- g_return_val_if_fail (standard_view->priv->drag_timer_id >= 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
+ _thunar_return_val_if_fail (standard_view->priv->drag_timer_id >= 0, FALSE);
/* cancel the pending drag timer */
g_source_remove (standard_view->priv->drag_timer_id);
@@ -2385,8 +2386,8 @@ thunar_standard_view_motion_notify_event (GtkWidget *view,
GdkDragContext *context;
GtkTargetList *target_list;
- g_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
- g_return_val_if_fail (standard_view->priv->drag_timer_id >= 0, FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
+ _thunar_return_val_if_fail (standard_view->priv->drag_timer_id >= 0, FALSE);
/* check if we passed the DnD threshold */
if (gtk_drag_check_threshold (view, standard_view->priv->drag_x, standard_view->priv->drag_y, event->x, event->y))
@@ -2416,7 +2417,7 @@ thunar_standard_view_scroll_event (GtkWidget *view,
GtkAction *action = NULL;
gboolean misc_horizontal_wheel_navigates;
- g_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
/* check if we should use the horizontal mouse wheel for navigation */
g_object_get (G_OBJECT (standard_view->preferences), "misc-horizontal-wheel-navigates", &misc_horizontal_wheel_navigates, NULL);
@@ -2457,7 +2458,7 @@ thunar_standard_view_key_press_event (GtkWidget *view,
GdkEventKey *event,
ThunarStandardView *standard_view)
{
- g_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view), FALSE);
/* need to catch "/" and "~" first, as the views would otherwise start interactive search */
if ((event->keyval == GDK_slash || event->keyval == GDK_asciitilde) && !(event->state & (~GDK_SHIFT_MASK & gtk_accelerator_get_default_mod_mask ())))
@@ -2960,9 +2961,9 @@ thunar_standard_view_error (ThunarListModel *model,
{
ThunarFile *file;
- g_return_if_fail (THUNAR_IS_LIST_MODEL (model));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- g_return_if_fail (standard_view->model == model);
+ _thunar_return_if_fail (THUNAR_IS_LIST_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (standard_view->model == model);
/* determine the ThunarFile for the current directory */
file = thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (standard_view));
@@ -2984,8 +2985,8 @@ thunar_standard_view_sort_column_changed (GtkTreeSortable *tree_sortable,
GtkSortType sort_order;
gint sort_column;
- g_return_if_fail (GTK_IS_TREE_SORTABLE (tree_sortable));
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (GTK_IS_TREE_SORTABLE (tree_sortable));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the new sort column and sort order */
if (gtk_tree_sortable_get_sort_column_id (tree_sortable, &sort_column, &sort_order))
@@ -3141,7 +3142,7 @@ thunar_standard_view_context_menu (ThunarStandardView *standard_view,
GList *selected_items;
guint id;
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* determine the selected items */
selected_items = (*THUNAR_STANDARD_VIEW_GET_CLASS (standard_view)->get_selected_items) (standard_view);
@@ -3213,8 +3214,8 @@ thunar_standard_view_queue_popup (ThunarStandardView *standard_view,
GtkWidget *view;
gint delay;
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
- g_return_if_fail (event != NULL);
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (event != NULL);
/* check if we have already scheduled a drag timer */
if (G_LIKELY (standard_view->priv->drag_timer_id < 0))
@@ -3265,7 +3266,7 @@ thunar_standard_view_selection_changed (ThunarStandardView *standard_view)
GList *lp, *selected_files;
gint n_selected_files = 0;
- g_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
+ _thunar_return_if_fail (THUNAR_IS_STANDARD_VIEW (standard_view));
/* drop any existing "new-files" closure */
if (G_UNLIKELY (standard_view->priv->new_files_closure != NULL))
diff --git a/thunar/thunar-statusbar.c b/thunar/thunar-statusbar.c
index ef08d5225c4940cc0786034aa2d9baebe08787d2..41b94d2ea7da14ac3622d916d67bffb25aa6f224 100644
--- a/thunar/thunar-statusbar.c
+++ b/thunar/thunar-statusbar.c
@@ -24,6 +24,7 @@
#include <exo/exo.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-statusbar.h>
@@ -170,8 +171,8 @@ void
thunar_statusbar_set_text (ThunarStatusbar *statusbar,
const gchar *text)
{
- g_return_if_fail (THUNAR_IS_STATUSBAR (statusbar));
- g_return_if_fail (text != NULL);
+ _thunar_return_if_fail (THUNAR_IS_STATUSBAR (statusbar));
+ _thunar_return_if_fail (text != NULL);
gtk_statusbar_pop (GTK_STATUSBAR (statusbar), statusbar->context_id);
gtk_statusbar_push (GTK_STATUSBAR (statusbar), statusbar->context_id, text);
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
index af05a6b46f16c17a00b9a881ffaea049188ca345..a5ac2388b6ac4b5ef9d24467dc695ef72bdc1729 100644
--- a/thunar/thunar-templates-action.c
+++ b/thunar/thunar-templates-action.c
@@ -23,6 +23,7 @@
#include <thunar-vfs/thunar-vfs.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-templates-action.h>
@@ -149,7 +150,7 @@ thunar_templates_action_create_menu_item (GtkAction *action)
GtkWidget *item;
GtkWidget *menu;
- g_return_val_if_fail (THUNAR_IS_TEMPLATES_ACTION (action), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_TEMPLATES_ACTION (action), NULL);
/* let GtkAction allocate the menu item */
item = (*GTK_ACTION_CLASS (thunar_templates_action_parent_class)->create_menu_item) (action);
@@ -198,8 +199,8 @@ item_activated (GtkWidget *item,
{
const ThunarVfsInfo *info;
- g_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
- g_return_if_fail (GTK_IS_WIDGET (item));
+ _thunar_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
+ _thunar_return_if_fail (GTK_IS_WIDGET (item));
/* check if an info is set for the item (else it's the "Empty File" item) */
info = g_object_get_data (G_OBJECT (item), I_("thunar-vfs-info"));
@@ -352,8 +353,8 @@ thunar_templates_action_menu_shown (GtkWidget *menu,
GtkWidget *item;
GList *children;
- g_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
- g_return_if_fail (GTK_IS_MENU_SHELL (menu));
+ _thunar_return_if_fail (THUNAR_IS_TEMPLATES_ACTION (templates_action));
+ _thunar_return_if_fail (GTK_IS_MENU_SHELL (menu));
/* drop all existing children of the menu first */
children = gtk_container_get_children (GTK_CONTAINER (menu));
@@ -414,8 +415,8 @@ GtkAction*
thunar_templates_action_new (const gchar *name,
const gchar *label)
{
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (label != NULL, NULL);
+ _thunar_return_val_if_fail (name != NULL, NULL);
+ _thunar_return_val_if_fail (label != NULL, NULL);
return g_object_new (THUNAR_TYPE_TEMPLATES_ACTION,
"hide-if-empty", FALSE,
diff --git a/thunar/thunar-throbber.c b/thunar/thunar-throbber.c
index fc074cfecd845b80817f4fedabf33304b6feb7ee..547f3b383d4dc4d808bc400d7929340c8b814308 100644
--- a/thunar/thunar-throbber.c
+++ b/thunar/thunar-throbber.c
@@ -24,6 +24,7 @@
#include <exo/exo.h>
#include <thunar/thunar-gobject-extensions.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-throbber.h>
#include <thunar/thunar-throbber-fallback.h>
@@ -360,7 +361,7 @@ thunar_throbber_new (void)
gboolean
thunar_throbber_get_animated (const ThunarThrobber *throbber)
{
- g_return_val_if_fail (THUNAR_IS_THROBBER (throbber), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_THROBBER (throbber), FALSE);
return throbber->animated;
}
@@ -377,7 +378,7 @@ void
thunar_throbber_set_animated (ThunarThrobber *throbber,
gboolean animated)
{
- g_return_if_fail (THUNAR_IS_THROBBER (throbber));
+ _thunar_return_if_fail (THUNAR_IS_THROBBER (throbber));
/* check if we're already in the requested state */
if (G_UNLIKELY (throbber->animated == animated))
diff --git a/thunar/thunar-thumbnail-generator.c b/thunar/thunar-thumbnail-generator.c
index 2be008e2e1b396a968913ef4a911accf6831a3a9..be3cf7e71f5d6b01ec0f7f9dd30fe9472812da2a 100644
--- a/thunar/thunar-thumbnail-generator.c
+++ b/thunar/thunar-thumbnail-generator.c
@@ -301,7 +301,7 @@ thunar_thumbnail_generator_new (ThunarVfsThumbFactory *factory)
{
ThunarThumbnailGenerator *generator;
- g_return_val_if_fail (THUNAR_VFS_IS_THUMB_FACTORY (factory), NULL);
+ _thunar_return_val_if_fail (THUNAR_VFS_IS_THUMB_FACTORY (factory), NULL);
/* allocate the generator object */
generator = g_object_new (THUNAR_TYPE_THUMBNAIL_GENERATOR, NULL);
@@ -325,8 +325,8 @@ thunar_thumbnail_generator_enqueue (ThunarThumbnailGenerator *generator,
GError *error = NULL;
GList *lp;
- g_return_if_fail (THUNAR_IS_THUMBNAIL_GENERATOR (generator));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_THUMBNAIL_GENERATOR (generator));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* acquire the generator lock */
g_mutex_lock (generator->lock);
diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c
index 1094594c0fc64bd6d44433ed68dba150ab9448da..3e3357cc54d81e9a22c157ba42aa30b4d1c280d4 100644
--- a/thunar/thunar-tree-model.c
+++ b/thunar/thunar-tree-model.c
@@ -452,7 +452,7 @@ thunar_tree_model_get_column_type (GtkTreeModel *tree_model,
return THUNAR_VFS_TYPE_VOLUME;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
return G_TYPE_INVALID;
}
}
@@ -470,7 +470,7 @@ thunar_tree_model_get_iter (GtkTreeModel *tree_model,
gint depth;
gint n;
- g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ _thunar_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
/* determine the path depth */
depth = gtk_tree_path_get_depth (path);
@@ -508,8 +508,8 @@ thunar_tree_model_get_path (GtkTreeModel *tree_model,
GNode *node;
gint n;
- g_return_val_if_fail (iter->user_data != NULL, NULL);
- g_return_val_if_fail (iter->stamp == model->stamp, NULL);
+ _thunar_return_val_if_fail (iter->user_data != NULL, NULL);
+ _thunar_return_val_if_fail (iter->stamp == model->stamp, NULL);
/* determine the node for the iterator */
node = iter->user_data;
@@ -572,9 +572,9 @@ thunar_tree_model_get_value (GtkTreeModel *tree_model,
ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
GNode *node = iter->user_data;
- g_return_if_fail (iter->user_data != NULL);
- g_return_if_fail (iter->stamp == model->stamp);
- g_return_if_fail (column < THUNAR_TREE_MODEL_N_COLUMNS);
+ _thunar_return_if_fail (iter->user_data != NULL);
+ _thunar_return_if_fail (iter->stamp == model->stamp);
+ _thunar_return_if_fail (column < THUNAR_TREE_MODEL_N_COLUMNS);
/* determine the item for the node */
item = node->data;
@@ -610,7 +610,7 @@ thunar_tree_model_get_value (GtkTreeModel *tree_model,
break;
default:
- g_assert_not_reached ();
+ _thunar_assert_not_reached ();
break;
}
}
@@ -621,10 +621,8 @@ static gboolean
thunar_tree_model_iter_next (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
-
- g_return_val_if_fail (iter->stamp == model->stamp, FALSE);
- g_return_val_if_fail (iter->user_data != NULL, FALSE);
+ _thunar_return_val_if_fail (iter->stamp == THUNAR_TREE_MODEL (tree_model)->stamp, FALSE);
+ _thunar_return_val_if_fail (iter->user_data != NULL, FALSE);
/* check if we have any further nodes in this row */
if (g_node_next_sibling (iter->user_data) != NULL)
@@ -646,8 +644,8 @@ thunar_tree_model_iter_children (GtkTreeModel *tree_model,
ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
GNode *children;
- g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
- g_return_val_if_fail (parent == NULL || parent->stamp == model->stamp, FALSE);
+ _thunar_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
+ _thunar_return_val_if_fail (parent == NULL || parent->stamp == model->stamp, FALSE);
if (G_LIKELY (parent != NULL))
children = g_node_first_child (parent->user_data);
@@ -670,10 +668,8 @@ static gboolean
thunar_tree_model_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
-
- g_return_val_if_fail (iter->stamp == model->stamp, FALSE);
- g_return_val_if_fail (iter->user_data != NULL, FALSE);
+ _thunar_return_val_if_fail (iter->stamp == THUNAR_TREE_MODEL (tree_model)->stamp, FALSE);
+ _thunar_return_val_if_fail (iter->user_data != NULL, FALSE);
return (g_node_first_child (iter->user_data) != NULL);
}
@@ -686,8 +682,8 @@ thunar_tree_model_iter_n_children (GtkTreeModel *tree_model,
{
ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
- g_return_val_if_fail (iter == NULL || iter->user_data != NULL, 0);
- g_return_val_if_fail (iter == NULL || iter->stamp == model->stamp, 0);
+ _thunar_return_val_if_fail (iter == NULL || iter->user_data != NULL, 0);
+ _thunar_return_val_if_fail (iter == NULL || iter->stamp == model->stamp, 0);
return g_node_n_children ((iter == NULL) ? model->root : iter->user_data);
}
@@ -703,8 +699,8 @@ thunar_tree_model_iter_nth_child (GtkTreeModel *tree_model,
ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
GNode *child;
- g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
- g_return_val_if_fail (parent == NULL || parent->stamp == model->stamp, FALSE);
+ _thunar_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
+ _thunar_return_val_if_fail (parent == NULL || parent->stamp == model->stamp, FALSE);
child = g_node_nth_child ((parent != NULL) ? parent->user_data : model->root, n);
if (G_LIKELY (child != NULL))
@@ -727,9 +723,9 @@ thunar_tree_model_iter_parent (GtkTreeModel *tree_model,
ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
GNode *parent;
- g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (child->user_data != NULL, FALSE);
- g_return_val_if_fail (child->stamp == model->stamp, FALSE);
+ _thunar_return_val_if_fail (iter != NULL, FALSE);
+ _thunar_return_val_if_fail (child->user_data != NULL, FALSE);
+ _thunar_return_val_if_fail (child->stamp == model->stamp, FALSE);
/* check if we have a parent for iter */
parent = G_NODE (child->user_data)->parent;
@@ -756,8 +752,8 @@ thunar_tree_model_ref_node (GtkTreeModel *tree_model,
ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
GNode *node;
- g_return_if_fail (iter->user_data != NULL);
- g_return_if_fail (iter->stamp == model->stamp);
+ _thunar_return_if_fail (iter->user_data != NULL);
+ _thunar_return_if_fail (iter->stamp == model->stamp);
/* determine the node for the iterator */
node = G_NODE (iter->user_data);
@@ -788,8 +784,8 @@ thunar_tree_model_unref_node (GtkTreeModel *tree_model,
ThunarTreeModel *model = THUNAR_TREE_MODEL (tree_model);
GNode *node;
- g_return_if_fail (iter->user_data != NULL);
- g_return_if_fail (iter->stamp == model->stamp);
+ _thunar_return_if_fail (iter->user_data != NULL);
+ _thunar_return_if_fail (iter->stamp == model->stamp);
/* determine the node for the iterator */
node = G_NODE (iter->user_data);
@@ -898,10 +894,10 @@ thunar_tree_model_file_changed (ThunarFileMonitor *file_monitor,
ThunarFile *file,
ThunarTreeModel *model)
{
- g_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
- g_return_if_fail (model->file_monitor == file_monitor);
- g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_FILE_MONITOR (file_monitor));
+ _thunar_return_if_fail (model->file_monitor == file_monitor);
+ _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* traverse the model and emit "row-changed" for the file's nodes */
g_node_traverse (model->root, G_POST_ORDER, G_TRAVERSE_ALL, -1, thunar_tree_model_node_traverse_changed, file);
@@ -921,8 +917,8 @@ thunar_tree_model_volume_changed (ThunarVfsVolume *volume,
GList list;
GList *lp;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
- g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
+ _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
/* check if the volume is on the hidden list */
lp = g_list_find (model->hidden_volumes, volume);
@@ -977,8 +973,8 @@ thunar_tree_model_volume_changed (ThunarVfsVolume *volume,
}
/* verify that we actually found the item */
- g_assert (item != NULL);
- g_assert (item->volume == volume);
+ _thunar_assert (item != NULL);
+ _thunar_assert (item->volume == volume);
/* check if we need to hide the volume now */
if (!thunar_vfs_volume_is_present (volume) || !thunar_vfs_volume_is_removable (volume))
@@ -1052,9 +1048,9 @@ thunar_tree_model_volume_pre_unmount (ThunarVfsVolumeManager *volume_manager,
GtkTreeIter iter;
GNode *node;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
- g_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
- g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
+ _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
/* lookup the node for the volume (if visible) */
for (node = model->root->children; node != NULL; node = node->next)
@@ -1094,8 +1090,8 @@ thunar_tree_model_volumes_added (ThunarVfsVolumeManager *volume_manager,
{
GList *lp;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
- g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+ _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
/* process all newly added volumes */
for (lp = volumes; lp != NULL; lp = lp->next)
@@ -1125,8 +1121,8 @@ thunar_tree_model_volumes_removed (ThunarVfsVolumeManager *volume_manager,
GList *hp;
GList *lp;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
- g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+ _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
/* process all removed volumes */
for (lp = volumes; lp != NULL; lp = lp->next)
@@ -1150,8 +1146,8 @@ thunar_tree_model_volumes_removed (ThunarVfsVolumeManager *volume_manager,
break;
/* something is broken if we don't have an item here */
- g_assert (node != NULL);
- g_assert (THUNAR_TREE_MODEL_ITEM (node->data)->volume == lp->data);
+ _thunar_assert (node != NULL);
+ _thunar_assert (THUNAR_TREE_MODEL_ITEM (node->data)->volume == lp->data);
/* drop the node from the model */
g_node_traverse (node, G_POST_ORDER, G_TRAVERSE_ALL, -1, thunar_tree_model_node_traverse_remove, model);
@@ -1284,8 +1280,8 @@ thunar_tree_model_item_files_added (ThunarTreeModelItem *item,
GNode *node = NULL;
GList *lp;
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (item->folder == folder);
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (item->folder == folder);
/* process all specified files */
for (lp = files; lp != NULL; lp = lp->next)
@@ -1365,8 +1361,8 @@ thunar_tree_model_item_files_removed (ThunarTreeModelItem *item,
GNode *node;
GList *lp;
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (item->folder == folder);
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (item->folder == folder);
/* determine the node for the folder */
node = g_node_find (model->root, G_POST_ORDER, G_TRAVERSE_ALL, item);
@@ -1403,8 +1399,8 @@ thunar_tree_model_item_notify_loading (ThunarTreeModelItem *item,
{
GNode *node;
- g_return_if_fail (THUNAR_IS_FOLDER (folder));
- g_return_if_fail (item->folder == folder);
+ _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
+ _thunar_return_if_fail (item->folder == folder);
/* be sure to drop the dummy child node once the folder is loaded */
if (G_LIKELY (!thunar_folder_get_loading (folder)))
@@ -1425,7 +1421,7 @@ thunar_tree_model_item_load_idle (gpointer user_data)
ThunarTreeModelItem *item = user_data;
GList *files;
- g_return_val_if_fail (item->folder == NULL, FALSE);
+ _thunar_return_val_if_fail (item->folder == NULL, FALSE);
GDK_THREADS_ENTER ();
@@ -1667,7 +1663,7 @@ thunar_tree_model_get_default (void)
gboolean
thunar_tree_model_get_case_sensitive (ThunarTreeModel *model)
{
- g_return_val_if_fail (THUNAR_IS_TREE_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_TREE_MODEL (model), FALSE);
return model->sort_case_sensitive;
}
@@ -1685,7 +1681,7 @@ void
thunar_tree_model_set_case_sensitive (ThunarTreeModel *model,
gboolean case_sensitive)
{
- g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+ _thunar_return_if_fail (THUNAR_IS_TREE_MODEL (model));
/* normalize the setting */
case_sensitive = !!case_sensitive;
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index 8a169a4efa9b293c8881330cbf59107f0ee38cfa..2bc823bac6c58a475efc484ff5d3d480f1a57b55 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -29,9 +29,10 @@
#include <thunar/thunar-dialogs.h>
#include <thunar/thunar-dnd.h>
#include <thunar/thunar-marshal.h>
-#include <thunar/thunar-shortcuts-icon-renderer.h>
#include <thunar/thunar-preferences.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-properties-dialog.h>
+#include <thunar/thunar-shortcuts-icon-renderer.h>
#include <thunar/thunar-tree-model.h>
#include <thunar/thunar-tree-view.h>
@@ -967,7 +968,7 @@ thunar_tree_view_test_expand_row (GtkTreeView *tree_view,
static gboolean
thunar_tree_view_delete_selected_files (ThunarTreeView *view)
{
- g_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
/* ask the user whether to delete the folder... */
thunar_tree_view_action_delete (view);
@@ -1397,7 +1398,7 @@ thunar_tree_view_action_copy (ThunarTreeView *view)
ThunarFile *file;
GList list;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* verify that we're connected to the clipboard */
if (G_UNLIKELY (view->clipboard == NULL))
@@ -1432,7 +1433,7 @@ thunar_tree_view_action_create_folder (ThunarTreeView *view)
GList path_list;
gchar *name;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* determine the selected directory */
directory = thunar_tree_view_get_selected_file (view);
@@ -1477,7 +1478,7 @@ thunar_tree_view_action_cut (ThunarTreeView *view)
ThunarFile *file;
GList list;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* verify that we're connected to the clipboard */
if (G_UNLIKELY (view->clipboard == NULL))
@@ -1509,7 +1510,7 @@ thunar_tree_view_action_delete (ThunarTreeView *view)
ThunarFile *file;
GList file_list;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* determine the selected file */
file = thunar_tree_view_get_selected_file (view);
@@ -1539,7 +1540,7 @@ thunar_tree_view_action_eject (ThunarTreeView *view)
GtkWidget *window;
GError *error = NULL;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* determine the selected volume */
volume = thunar_tree_view_get_selected_volume (view);
@@ -1568,7 +1569,7 @@ thunar_tree_view_action_empty_trash (ThunarTreeView *view)
{
ThunarApplication *application;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* empty the trash bin (asking the user first) */
application = thunar_application_get ();
@@ -1586,7 +1587,7 @@ thunar_tree_view_action_mount (ThunarTreeView *view)
gboolean result = TRUE;
GError *error = NULL;
- g_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
/* determine the selected volume */
volume = thunar_tree_view_get_selected_volume (view);
@@ -1622,7 +1623,7 @@ thunar_tree_view_action_open (ThunarTreeView *view)
{
ThunarFile *file;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* if its a volume, make sure its mounted */
if (!thunar_tree_view_action_mount (view))
@@ -1646,7 +1647,7 @@ thunar_tree_view_action_open_in_new_window (ThunarTreeView *view)
ThunarApplication *application;
ThunarFile *file;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* if its a volume, make sure its mounted */
if (!thunar_tree_view_action_mount (view))
@@ -1671,7 +1672,7 @@ thunar_tree_view_action_paste_into_folder (ThunarTreeView *view)
{
ThunarFile *file;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* verify that we're connected to the clipboard */
if (G_UNLIKELY (view->clipboard == NULL))
@@ -1698,7 +1699,7 @@ thunar_tree_view_action_properties (ThunarTreeView *view)
GtkWidget *dialog;
GtkWidget *toplevel;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* determine the selected file */
file = thunar_tree_view_get_selected_file (view);
@@ -1730,7 +1731,7 @@ thunar_tree_view_action_unmount (ThunarTreeView *view)
GtkWidget *window;
GError *error = NULL;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* determine the selected volume */
volume = thunar_tree_view_get_selected_volume (view);
@@ -2111,7 +2112,7 @@ thunar_tree_view_new (void)
gboolean
thunar_tree_view_get_show_hidden (ThunarTreeView *view)
{
- g_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
return view->show_hidden;
}
@@ -2131,7 +2132,7 @@ thunar_tree_view_set_show_hidden (ThunarTreeView *view,
{
GtkTreeModel *filter;
- g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_TREE_VIEW (view));
/* normalize the value */
show_hidden = !!show_hidden;
diff --git a/thunar/thunar-util.c b/thunar/thunar-util.c
index d18da0f2b371f9554cf2f8e7d8ea44ecd983d972..65bd61625ec39aec85b6b92ea499bf4f40de0c9b 100644
--- a/thunar/thunar-util.c
+++ b/thunar/thunar-util.c
@@ -34,6 +34,7 @@
#include <time.h>
#endif
+#include <thunar/thunar-private.h>
#include <thunar/thunar-util.h>
@@ -50,7 +51,7 @@
gboolean
thunar_util_looks_like_an_uri (const gchar *string)
{
- g_return_val_if_fail (string != NULL, FALSE);
+ _thunar_return_val_if_fail (string != NULL, FALSE);
/* <scheme> starts with an alpha character */
if (g_ascii_isalpha (*string))
@@ -151,7 +152,7 @@ thunar_util_parse_parent (gpointer parent,
GdkScreen *screen;
GtkWidget *window = NULL;
- g_return_val_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent), NULL);
+ _thunar_return_val_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent), NULL);
/* determine the proper parent */
if (parent == NULL)
diff --git a/thunar/thunar-view.c b/thunar/thunar-view.c
index df7bfb9c48dd880b0ed8810129bef7c2c960cd56..7b74f8171ef4961c3861de59d313b143ce1818d6 100644
--- a/thunar/thunar-view.c
+++ b/thunar/thunar-view.c
@@ -21,11 +21,12 @@
#include <config.h>
#endif
+#include <thunar/thunar-private.h>
#include <thunar/thunar-view.h>
-static void thunar_view_class_init (gpointer klass);
+static void thunar_view_class_init (gpointer klass);
@@ -139,7 +140,7 @@ thunar_view_class_init (gpointer klass)
gboolean
thunar_view_get_loading (ThunarView *view)
{
- g_return_val_if_fail (THUNAR_IS_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_VIEW (view), FALSE);
return (*THUNAR_VIEW_GET_IFACE (view)->get_loading) (view);
}
@@ -158,7 +159,7 @@ thunar_view_get_loading (ThunarView *view)
const gchar*
thunar_view_get_statusbar_text (ThunarView *view)
{
- g_return_val_if_fail (THUNAR_IS_VIEW (view), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_VIEW (view), NULL);
return (*THUNAR_VIEW_GET_IFACE (view)->get_statusbar_text) (view);
}
@@ -176,7 +177,7 @@ thunar_view_get_statusbar_text (ThunarView *view)
gboolean
thunar_view_get_show_hidden (ThunarView *view)
{
- g_return_val_if_fail (THUNAR_IS_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_VIEW (view), FALSE);
return (*THUNAR_VIEW_GET_IFACE (view)->get_show_hidden) (view);
}
@@ -195,7 +196,7 @@ void
thunar_view_set_show_hidden (ThunarView *view,
gboolean show_hidden)
{
- g_return_if_fail (THUNAR_IS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_VIEW (view));
(*THUNAR_VIEW_GET_IFACE (view)->set_show_hidden) (view, show_hidden);
}
@@ -212,7 +213,7 @@ thunar_view_set_show_hidden (ThunarView *view,
ThunarZoomLevel
thunar_view_get_zoom_level (ThunarView *view)
{
- g_return_val_if_fail (THUNAR_IS_VIEW (view), THUNAR_ZOOM_LEVEL_NORMAL);
+ _thunar_return_val_if_fail (THUNAR_IS_VIEW (view), THUNAR_ZOOM_LEVEL_NORMAL);
return (*THUNAR_VIEW_GET_IFACE (view)->get_zoom_level) (view);
}
@@ -229,8 +230,8 @@ void
thunar_view_set_zoom_level (ThunarView *view,
ThunarZoomLevel zoom_level)
{
- g_return_if_fail (THUNAR_IS_VIEW (view));
- g_return_if_fail (zoom_level >= 0 && zoom_level < THUNAR_ZOOM_N_LEVELS);
+ _thunar_return_if_fail (THUNAR_IS_VIEW (view));
+ _thunar_return_if_fail (zoom_level >= 0 && zoom_level < THUNAR_ZOOM_N_LEVELS);
(*THUNAR_VIEW_GET_IFACE (view)->set_zoom_level) (view, zoom_level);
}
@@ -246,7 +247,7 @@ thunar_view_set_zoom_level (ThunarView *view,
void
thunar_view_reset_zoom_level (ThunarView *view)
{
- g_return_if_fail (THUNAR_IS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_VIEW (view));
(*THUNAR_VIEW_GET_IFACE (view)->reset_zoom_level) (view);
}
@@ -262,7 +263,7 @@ thunar_view_reset_zoom_level (ThunarView *view)
void
thunar_view_reload (ThunarView *view)
{
- g_return_if_fail (THUNAR_IS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_VIEW (view));
(*THUNAR_VIEW_GET_IFACE (view)->reload) (view);
}
@@ -288,7 +289,7 @@ thunar_view_get_visible_range (ThunarView *view,
ThunarFile **start_file,
ThunarFile **end_file)
{
- g_return_val_if_fail (THUNAR_IS_VIEW (view), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_VIEW (view), FALSE);
return (*THUNAR_VIEW_GET_IFACE (view)->get_visible_range) (view, start_file, end_file);
}
@@ -315,10 +316,10 @@ thunar_view_scroll_to_file (ThunarView *view,
gfloat row_align,
gfloat col_align)
{
- g_return_if_fail (THUNAR_IS_VIEW (view));
- g_return_if_fail (THUNAR_IS_FILE (file));
- g_return_if_fail (row_align >= 0.0f && row_align <= 1.0f);
- g_return_if_fail (col_align >= 0.0f && col_align <= 1.0f);
+ _thunar_return_if_fail (THUNAR_IS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (row_align >= 0.0f && row_align <= 1.0f);
+ _thunar_return_if_fail (col_align >= 0.0f && col_align <= 1.0f);
(*THUNAR_VIEW_GET_IFACE (view)->scroll_to_file) (view, file, select, use_align, row_align, col_align);
}
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index f0add0a8425450b3053d411153eb4bc21b902f14..f572bdb05d66e2e45715203abe1f1603b7d446ab 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -41,9 +41,10 @@
#include <thunar/thunar-pango-extensions.h>
#include <thunar/thunar-preferences-dialog.h>
#include <thunar/thunar-preferences.h>
-#include <thunar/thunar-throbber.h>
+#include <thunar/thunar-private.h>
#include <thunar/thunar-statusbar.h>
#include <thunar/thunar-stock.h>
+#include <thunar/thunar-throbber.h>
#include <thunar/thunar-tree-pane.h>
#include <thunar/thunar-window.h>
#include <thunar/thunar-window-ui.h>
@@ -878,7 +879,7 @@ thunar_window_back (ThunarWindow *window)
{
GtkAction *action;
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
/* activate the "back" action */
action = thunar_gtk_ui_manager_get_action_by_name (window->ui_manager, "back");
@@ -896,7 +897,7 @@ thunar_window_back (ThunarWindow *window)
static gboolean
thunar_window_reload (ThunarWindow *window)
{
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
/* force the view to reload */
if (G_LIKELY (window->view != NULL))
@@ -916,7 +917,7 @@ thunar_window_toggle_sidepane (ThunarWindow *window)
GtkAction *action;
gchar *type_name;
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
/* check if a side pane is currently active */
if (G_LIKELY (window->sidepane != NULL))
@@ -959,7 +960,7 @@ thunar_window_toggle_sidepane (ThunarWindow *window)
static gboolean
thunar_window_zoom_in (ThunarWindow *window)
{
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
/* check if we can still zoom in */
if (G_LIKELY (window->zoom_level < THUNAR_ZOOM_N_LEVELS - 1))
@@ -976,7 +977,7 @@ thunar_window_zoom_in (ThunarWindow *window)
static gboolean
thunar_window_zoom_out (ThunarWindow *window)
{
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
/* check if we can still zoom out */
if (G_LIKELY (window->zoom_level > 0))
@@ -993,7 +994,7 @@ thunar_window_zoom_out (ThunarWindow *window)
static gboolean
thunar_window_zoom_reset (ThunarWindow *window)
{
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), FALSE);
/* tell the view to reset it's zoom level */
if (G_LIKELY (window->view != NULL))
@@ -1072,8 +1073,8 @@ static void
thunar_window_install_sidepane (ThunarWindow *window,
GType type)
{
- g_return_if_fail (type == G_TYPE_NONE || g_type_is_a (type, THUNAR_TYPE_SIDE_PANE));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (type == G_TYPE_NONE || g_type_is_a (type, THUNAR_TYPE_SIDE_PANE));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* drop the previous side pane (if any) */
if (G_UNLIKELY (window->sidepane != NULL))
@@ -1112,8 +1113,8 @@ thunar_window_merge_custom_preferences (ThunarWindow *window)
GList *actions;
GList *ap, *pp;
- g_return_if_fail (THUNAR_IS_WINDOW (window));
- g_return_if_fail (window->custom_preferences_merge_id == 0);
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (window->custom_preferences_merge_id == 0);
/* determine the available preferences providers */
providers = thunarx_provider_factory_list_providers (window->provider_factory, THUNARX_TYPE_PREFERENCES_PROVIDER);
@@ -1278,8 +1279,8 @@ thunar_window_action_preferences (GtkAction *action,
{
GtkWidget *dialog;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* allocate and display a preferences dialog */
dialog = thunar_preferences_dialog_new (GTK_WINDOW (window));
@@ -1294,8 +1295,8 @@ thunar_window_action_reload (GtkAction *action,
{
gboolean result;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* force the view to reload */
g_signal_emit (G_OBJECT (window), window_signals[RELOAD], 0, &result);
@@ -1471,8 +1472,8 @@ thunar_window_action_statusbar_changed (GtkToggleAction *action,
{
gboolean active;
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the new state of the action */
active = gtk_toggle_action_get_active (action);
@@ -1508,8 +1509,8 @@ thunar_window_action_zoom_in (GtkAction *action,
{
gboolean result;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* increase the zoom level */
g_signal_emit (G_OBJECT (window), window_signals[ZOOM_IN], 0, &result);
@@ -1523,8 +1524,8 @@ thunar_window_action_zoom_out (GtkAction *action,
{
gboolean result;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* decrease the zoom level */
g_signal_emit (G_OBJECT (window), window_signals[ZOOM_OUT], 0, &result);
@@ -1538,8 +1539,8 @@ thunar_window_action_zoom_reset (GtkAction *action,
{
gboolean result;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* reset zoom level */
g_signal_emit (G_OBJECT (window), window_signals[ZOOM_RESET], 0, &result);
@@ -1651,8 +1652,8 @@ thunar_window_action_open_home (GtkAction *action,
ThunarFile *home_file;
GError *error = NULL;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the path to the home directory */
home_path = thunar_vfs_path_get_for_home ();
@@ -1695,8 +1696,8 @@ thunar_window_action_open_templates (GtkAction *action,
GError *error = NULL;
gchar *absolute_path;
- g_return_if_fail (GTK_IS_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the path to the ~/Templates folder */
home_path = thunar_vfs_path_get_for_home ();
@@ -1823,8 +1824,8 @@ static void
thunar_window_action_show_hidden (GtkToggleAction *action,
ThunarWindow *window)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* just emit the "notify" signal for the "show-hidden"
* signal and the view will automatically sync its state.
@@ -1840,9 +1841,9 @@ thunar_window_current_directory_changed (ThunarFile *current_directory,
{
GdkPixbuf *icon;
- g_return_if_fail (THUNAR_IS_WINDOW (window));
- g_return_if_fail (THUNAR_IS_FILE (current_directory));
- g_return_if_fail (window->current_directory == current_directory);
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (THUNAR_IS_FILE (current_directory));
+ _thunar_return_if_fail (window->current_directory == current_directory);
/* set window title and icon */
icon = thunar_icon_factory_load_file_icon (window->icon_factory, current_directory, THUNAR_FILE_ICON_STATE_DEFAULT, 48);
@@ -1861,9 +1862,9 @@ thunar_window_current_directory_destroy (ThunarFile *current_directory,
ThunarVfsInfo *info;
ThunarFile *file = NULL;
- g_return_if_fail (THUNAR_IS_WINDOW (window));
- g_return_if_fail (THUNAR_IS_FILE (current_directory));
- g_return_if_fail (window->current_directory == current_directory);
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (THUNAR_IS_FILE (current_directory));
+ _thunar_return_if_fail (window->current_directory == current_directory);
/* determine the path of the current directory */
path = thunar_file_get_path (current_directory);
@@ -1982,9 +1983,9 @@ thunar_window_notify_loading (ThunarView *view,
{
GdkCursor *cursor;
- g_return_if_fail (THUNAR_IS_VIEW (view));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
- g_return_if_fail (THUNAR_VIEW (window->view) == view);
+ _thunar_return_if_fail (THUNAR_IS_VIEW (view));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (THUNAR_VIEW (window->view) == view);
if (GTK_WIDGET_REALIZED (window))
{
@@ -2013,9 +2014,9 @@ thunar_window_volume_pre_unmount (ThunarVfsVolumeManager *volume_manager,
ThunarFile *file;
GtkAction *action;
- g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
- g_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
- g_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+ _thunar_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* nothing to do if we don't have a current directory */
if (G_UNLIKELY (window->current_directory == NULL))
@@ -2143,7 +2144,7 @@ thunar_window_new (void)
ThunarFile*
thunar_window_get_current_directory (ThunarWindow *window)
{
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), NULL);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), NULL);
return window->current_directory;
}
@@ -2160,8 +2161,8 @@ thunar_window_set_current_directory (ThunarWindow *window,
{
ThunarFile *file;
- g_return_if_fail (THUNAR_IS_WINDOW (window));
- g_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (current_directory == NULL || THUNAR_IS_FILE (current_directory));
/* check if we already display the requested directory */
if (G_UNLIKELY (window->current_directory == current_directory))
@@ -2234,7 +2235,7 @@ thunar_window_set_current_directory (ThunarWindow *window,
ThunarZoomLevel
thunar_window_get_zoom_level (ThunarWindow *window)
{
- g_return_val_if_fail (THUNAR_IS_WINDOW (window), THUNAR_ZOOM_LEVEL_NORMAL);
+ _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), THUNAR_ZOOM_LEVEL_NORMAL);
return window->zoom_level;
}
@@ -2251,8 +2252,8 @@ void
thunar_window_set_zoom_level (ThunarWindow *window,
ThunarZoomLevel zoom_level)
{
- g_return_if_fail (THUNAR_IS_WINDOW (window));
- g_return_if_fail (zoom_level >= 0 && zoom_level < THUNAR_ZOOM_N_LEVELS);
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (zoom_level >= 0 && zoom_level < THUNAR_ZOOM_N_LEVELS);
/* check if we have a new zoom level */
if (G_LIKELY (window->zoom_level != zoom_level))
@@ -2291,8 +2292,8 @@ thunar_window_scroll_to_file (ThunarWindow *window,
gfloat row_align,
gfloat col_align)
{
- g_return_if_fail (THUNAR_IS_WINDOW (window));
- g_return_if_fail (THUNAR_IS_FILE (file));
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (THUNAR_IS_FILE (file));
/* verify that we have a valid view */
if (G_LIKELY (window->view != NULL))