summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-file-changes-queue.c14
-rw-r--r--libcaja-private/caja-undostack-manager.c32
2 files changed, 23 insertions, 23 deletions
diff --git a/libcaja-private/caja-file-changes-queue.c b/libcaja-private/caja-file-changes-queue.c
index b77d13cf..127de7ed 100644
--- a/libcaja-private/caja-file-changes-queue.c
+++ b/libcaja-private/caja-file-changes-queue.c
@@ -60,7 +60,7 @@ typedef struct
GList *head;
GList *tail;
#ifdef G_THREADS_ENABLED
-# if GLIB_CHECK_VERSION(3, 32, 0)
+# if GLIB_CHECK_VERSION(2, 32, 0)
GMutex mutex;
# else
GMutex *mutex;
@@ -76,7 +76,7 @@ caja_file_changes_queue_new (void)
result = g_new0 (CajaFileChangesQueue, 1);
#ifdef G_THREADS_ENABLED
-# if GLIB_CHECK_VERSION(3, 32, 0)
+# if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_init (&result->mutex);
# else
result->mutex = g_mutex_new ();
@@ -135,7 +135,7 @@ caja_file_changes_queue_free (CajaFileChangesQueue *queue)
g_list_free (queue->head);
#ifdef G_THREADS_ENABLED
-# if GLIB_CHECK_VERSION(3, 32, 0)
+# if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_clear (&queue->mutex);
# else
g_mutex_free (queue->mutex);
@@ -151,7 +151,7 @@ caja_file_changes_queue_add_common (CajaFileChangesQueue *queue,
CajaFileChange *new_item)
{
/* enqueue the new queue item while locking down the list */
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
MUTEX_LOCK (&queue->mutex);
#else
MUTEX_LOCK (queue->mutex);
@@ -161,7 +161,7 @@ caja_file_changes_queue_add_common (CajaFileChangesQueue *queue,
if (queue->tail == NULL)
queue->tail = queue->head;
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
MUTEX_UNLOCK (&queue->mutex);
#else
MUTEX_UNLOCK (queue->mutex);
@@ -267,7 +267,7 @@ caja_file_changes_queue_get_change (CajaFileChangesQueue *queue)
g_assert (queue != NULL);
/* dequeue the tail item while locking down the list */
-#if GLIB_CHECK_VERSION (3, 32, 0)
+#if GLIB_CHECK_VERSION (2, 32, 0)
MUTEX_LOCK (&queue->mutex);
#else
MUTEX_LOCK (queue->mutex);
@@ -287,7 +287,7 @@ caja_file_changes_queue_get_change (CajaFileChangesQueue *queue)
queue->tail = new_tail;
}
-#if GLIB_CHECK_VERSION (3, 32, 0)
+#if GLIB_CHECK_VERSION (2, 32, 0)
MUTEX_UNLOCK (&queue->mutex);
#else
MUTEX_UNLOCK (queue->mutex);
diff --git a/libcaja-private/caja-undostack-manager.c b/libcaja-private/caja-undostack-manager.c
index 8c26c55b..5686abfa 100644
--- a/libcaja-private/caja-undostack-manager.c
+++ b/libcaja-private/caja-undostack-manager.c
@@ -100,7 +100,7 @@ struct _CajaUndoStackManagerPrivate
GQueue *stack;
guint undo_levels;
guint index;
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
GMutex mutex; /* Used to protect access to stack (because of async file ops) */
#else
GMutex *mutex; /* Used to protect access to stack (because of async file ops) */
@@ -273,7 +273,7 @@ caja_undostack_manager_init (CajaUndoStackManager * self)
/* Initialize private fields */
priv->stack = g_queue_new ();
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_init (&priv->mutex);
#else
priv->mutex = g_mutex_new ();
@@ -293,7 +293,7 @@ caja_undostack_manager_dispose (GObject * object)
if (priv->dispose_has_run)
return;
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_lock (&priv->mutex);
#else
g_mutex_lock (priv->mutex);
@@ -302,7 +302,7 @@ caja_undostack_manager_dispose (GObject * object)
/* Free each undoable action in the stack and the stack itself */
undostack_dispose_all (priv->stack);
g_queue_free (priv->stack);
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_unlock (&priv->mutex);
g_mutex_clear (&priv->mutex);
#else
@@ -339,13 +339,13 @@ caja_undostack_manager_set_property (GObject * object, guint prop_id,
new_undo_levels = g_value_get_uint (value);
if (new_undo_levels > 0 && (priv->undo_levels != new_undo_levels)) {
priv->undo_levels = new_undo_levels;
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_lock (&priv->mutex);
#else
g_mutex_lock (priv->mutex);
#endif
stack_fix_size (priv);
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_unlock (&priv->mutex);
#else
g_mutex_unlock (priv->mutex);
@@ -436,7 +436,7 @@ caja_undostack_manager_redo (CajaUndoStackManager * manager,
char *puri;
CajaUndoStackManagerPrivate *priv = manager->priv;
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_lock (&priv->mutex);
#else
g_mutex_lock (priv->mutex);
@@ -450,7 +450,7 @@ caja_undostack_manager_redo (CajaUndoStackManager * manager,
action->locked = TRUE;
}
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_unlock (&priv->mutex);
#else
g_mutex_unlock (priv->mutex);
@@ -585,7 +585,7 @@ caja_undostack_manager_undo (CajaUndoStackManager * manager,
char *new_name;
CajaUndoStackManagerPrivate *priv = manager->priv;
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_lock (&priv->mutex);
#else
g_mutex_lock (priv->mutex);
@@ -597,7 +597,7 @@ caja_undostack_manager_undo (CajaUndoStackManager * manager,
action->locked = TRUE;
}
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_unlock (&priv->mutex);
#else
g_mutex_unlock (priv->mutex);
@@ -757,7 +757,7 @@ caja_undostack_manager_add_action (CajaUndoStackManager * manager,
action->manager = manager;
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_lock (&priv->mutex);
#else
g_mutex_lock (priv->mutex);
@@ -765,7 +765,7 @@ caja_undostack_manager_add_action (CajaUndoStackManager * manager,
stack_push_action (priv, action);
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_unlock (&priv->mutex);
#else
g_mutex_unlock (priv->mutex);
@@ -825,7 +825,7 @@ caja_undostack_manager_trash_has_emptied (CajaUndoStackManager *
/* Clear actions from the oldest to the newest move to trash */
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_lock (&priv->mutex);
#else
g_mutex_lock (priv->mutex);
@@ -855,7 +855,7 @@ caja_undostack_manager_trash_has_emptied (CajaUndoStackManager *
}
g_queue_free (tmp_stack);
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_unlock (&priv->mutex);
#else
g_mutex_unlock (priv->mutex);
@@ -1922,7 +1922,7 @@ do_menu_update (CajaUndoStackManager * manager)
CajaUndoStackManagerPrivate *priv = manager->priv;
CajaUndoStackMenuData *data = g_slice_new0 (CajaUndoStackMenuData);
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_lock (&priv->mutex);
#else
g_mutex_lock (priv->mutex);
@@ -1937,7 +1937,7 @@ do_menu_update (CajaUndoStackManager * manager)
data->redo_label = get_redo_label (action);
data->redo_description = get_redo_description (action);
-#if GLIB_CHECK_VERSION(3, 32, 0)
+#if GLIB_CHECK_VERSION(2, 32, 0)
g_mutex_unlock (&priv->mutex);
#else
g_mutex_unlock (priv->mutex);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 02:12:26 +0000