summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-bookmark.c4
-rw-r--r--libcaja-private/caja-desktop-metadata.c4
-rw-r--r--libcaja-private/caja-directory-async.c2
-rw-r--r--libcaja-private/caja-extensions.c36
-rw-r--r--libcaja-private/caja-extensions.h2
-rw-r--r--libcaja-private/caja-file-conflict-dialog.c10
-rw-r--r--libcaja-private/caja-file-operations.c2
-rw-r--r--libcaja-private/caja-file.c20
-rw-r--r--libcaja-private/caja-global-preferences.c2
-rw-r--r--libcaja-private/caja-icon-canvas-item.c6
-rw-r--r--libcaja-private/caja-undostack-manager.c10
-rw-r--r--libcaja-private/caja-undostack-manager.h14
-rw-r--r--libcaja-private/caja-window-info.c2
-rw-r--r--libcaja-private/caja-window-info.h4
14 files changed, 59 insertions, 59 deletions
diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c
index d7e72fb4..7fb0b485 100644
--- a/libcaja-private/caja-bookmark.c
+++ b/libcaja-private/caja-bookmark.c
@@ -626,10 +626,10 @@ bookmark_image_menu_item_new_from_surface (cairo_surface_t *icon_surface,
gtk_label_set_max_width_chars (label, (ELLIPSISED_MENU_ITEM_MIN_CHARS + 2));
GtkWidget *menuitem = gtk_menu_item_new ();
-
+
gtk_container_add (GTK_CONTAINER (box), icon);
gtk_container_add (GTK_CONTAINER (box), label_menu);
-
+
gtk_container_add (GTK_CONTAINER (menuitem), box);
gtk_widget_show_all (menuitem);
diff --git a/libcaja-private/caja-desktop-metadata.c b/libcaja-private/caja-desktop-metadata.c
index 41f0b021..c03bdf64 100644
--- a/libcaja-private/caja-desktop-metadata.c
+++ b/libcaja-private/caja-desktop-metadata.c
@@ -49,7 +49,7 @@ get_keyfile_path (void)
retval = g_build_filename (xdg_dir, "desktop-metadata", NULL);
g_free (xdg_dir);
-
+
return retval;
}
@@ -176,7 +176,7 @@ caja_desktop_set_metadata_string (CajaFile *file,
if (caja_desktop_update_metadata_from_keyfile (file, name)) {
caja_file_changed (file);
- }
+ }
}
#define STRV_TERMINATOR "@x-caja-desktop-metadata-term@"
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 68d6edee..615bcd93 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -907,7 +907,7 @@ static gboolean
should_skip_file (CajaDirectory *directory, GFileInfo *info)
{
static gboolean show_hidden_files_changed_callback_installed = FALSE;
-
+
/* Add the callback once for the life of our process */
if (!show_hidden_files_changed_callback_installed)
{
diff --git a/libcaja-private/caja-extensions.c b/libcaja-private/caja-extensions.c
index 580cd582..9b34fdcd 100644
--- a/libcaja-private/caja-extensions.c
+++ b/libcaja-private/caja-extensions.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
* Author: Alexander van der Meij <[email protected]>
@@ -82,8 +82,8 @@ gsettings_key_has_value (const gchar *value)
{
gchar **list;
gint i;
-
- list = g_settings_get_strv (caja_extension_preferences,
+
+ list = g_settings_get_strv (caja_extension_preferences,
CAJA_PREFERENCES_DISABLED_EXTENSIONS);
if (list != NULL)
@@ -108,21 +108,21 @@ gsettings_append_to_list (const char *value)
gchar **new;
gint size;
gboolean retval;
-
- current = g_settings_get_strv (caja_extension_preferences,
+
+ current = g_settings_get_strv (caja_extension_preferences,
CAJA_PREFERENCES_DISABLED_EXTENSIONS);
-
+
for (size = 0; current[size] != NULL; size++);
size += 1;
size += 1;
-
+
new = g_realloc_n (current, size, sizeof (gchar *));
new[size - 2] = g_strdup (value);
new[size - 1] = NULL;
-
- retval = g_settings_set_strv (caja_extension_preferences,
+
+ retval = g_settings_set_strv (caja_extension_preferences,
CAJA_PREFERENCES_DISABLED_EXTENSIONS,
(const gchar **) new);
@@ -137,19 +137,19 @@ gsettings_remove_from_list (const char *value)
GArray *array;
gint i;
gboolean retval;
-
- current = g_settings_get_strv (caja_extension_preferences,
+
+ current = g_settings_get_strv (caja_extension_preferences,
CAJA_PREFERENCES_DISABLED_EXTENSIONS);
-
+
array = g_array_new (TRUE, TRUE, sizeof (gchar *));
-
- for (i = 0; current[i] != NULL; i++)
+
+ for (i = 0; current[i] != NULL; i++)
{
if (g_strcmp0 (current[i], value) != 0)
array = g_array_append_val (array, current[i]);
}
-
- retval = g_settings_set_strv (caja_extension_preferences,
+
+ retval = g_settings_set_strv (caja_extension_preferences,
CAJA_PREFERENCES_DISABLED_EXTENSIONS,
(const gchar **) array->data);
@@ -221,7 +221,7 @@ caja_extension_set_state (Extension *ext, gboolean new_state)
g_return_val_if_fail (ext->state != new_state, FALSE);
ext->state = new_state;
}
-
+
gboolean retval;
if (new_state) {
retval = gsettings_remove_from_list (ext->filename);
@@ -229,7 +229,7 @@ caja_extension_set_state (Extension *ext, gboolean new_state)
else {
retval = gsettings_append_to_list (ext->filename);
}
-
+
g_return_val_if_fail (retval == TRUE, FALSE);
return TRUE;
}
diff --git a/libcaja-private/caja-extensions.h b/libcaja-private/caja-extensions.h
index 13fa99c3..547b1891 100644
--- a/libcaja-private/caja-extensions.h
+++ b/libcaja-private/caja-extensions.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
* Author: Alexander van der Meij <[email protected]>
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index 97266fb8..5b9f7252 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -346,7 +346,7 @@ file_list_ready_cb (GList *files,
gtk_button_set_label (GTK_BUTTON (details->replace_button),
_("Merge"));
}
-
+
/* If meld is installed, and source and destination arent binary
* files, show the diff button
*/
@@ -358,10 +358,10 @@ file_list_ready_cb (GList *files,
g_free (meld_found);
gboolean src_is_binary;
gboolean dest_is_binary;
-
+
src_is_binary = caja_file_is_binary (details->source);
dest_is_binary = caja_file_is_binary (details->destination);
-
+
if (!src_is_binary && !dest_is_binary)
gtk_widget_show (details->diff_button);
}
@@ -523,7 +523,7 @@ diff_button_clicked_cb (GtkButton *w,
{
CajaFileConflictDialogPrivate *details;
details = dialog->details;
-
+
GError *error;
char *command;
@@ -537,7 +537,7 @@ diff_button_clicked_cb (GtkButton *w,
argv[1] = g_file_get_path (caja_file_get_location (details->source));
argv[2] = g_file_get_path (caja_file_get_location (details->destination));
argv[3] = NULL;
-
+
error = NULL;
if (!g_spawn_async_with_pipes (NULL,
argv,
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index 5adb051b..d4fa7826 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -1038,7 +1038,7 @@ should_skip_file (CommonJob *common,
if (common->skip_files != NULL) {
return g_hash_table_lookup (common->skip_files, file) != NULL;
}
-
+
return FALSE;
}
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index e127d7f1..c57ffd38 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -2194,14 +2194,14 @@ update_info_internal (CajaFile *file,
file->details->is_symlink = is_symlink;
is_hidden = g_file_info_get_is_hidden (info);
- is_backup = g_file_info_get_is_backup (info);
+ is_backup = g_file_info_get_is_backup (info);
if (file->details->is_hidden != is_hidden ||
file->details->is_backup != is_backup) {
changed = TRUE;
}
file->details->is_hidden = is_hidden;
- file->details->is_backup = is_backup;
-
+ file->details->is_backup = is_backup;
+
is_mountpoint = g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT);
if (file->details->is_mountpoint != is_mountpoint) {
changed = TRUE;
@@ -4607,8 +4607,8 @@ caja_file_get_icon (CajaFile *file,
MAX (h * thumb_scale, 1),
GDK_INTERP_BILINEAR);
- /* Render frames only for thumbnails of non-image files
- and for images with no alpha channel. */
+ /* Render frames only for thumbnails of non-image files
+ and for images with no alpha channel. */
gboolean is_image = file->details->mime_type &&
(strncmp (file->details->mime_type, "image/", 6) == 0);
if (!is_image ||
@@ -7498,22 +7498,22 @@ caja_file_is_binary (CajaFile *file)
{
return FALSE;
}
-
+
gboolean is_binary = FALSE;
int i = 0;
FILE *fp;
-
+
/* Check the first 4096 bytes of the files. If these contains a 0,
* we can assume the file is binary.
* This idea is taken from python code of meld.
*/
-
+
fp = g_fopen (g_file_get_path (caja_file_get_location (file)), "r");
if (fp == NULL)
{
return FALSE;
}
-
+
while (!feof (fp)) {
int c;
@@ -7528,7 +7528,7 @@ caja_file_is_binary (CajaFile *file)
i++;
}
fclose(fp);
-
+
return is_binary;
}
diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
index 68ba38c5..2d3c3466 100644
--- a/libcaja-private/caja-global-preferences.c
+++ b/libcaja-private/caja-global-preferences.c
@@ -74,7 +74,7 @@ caja_global_preferences_init (void)
}
initialized = TRUE;
-
+
caja_preferences = g_settings_new("org.mate.caja.preferences");
caja_media_preferences = g_settings_new("org.mate.media-handling");
caja_window_state = g_settings_new("org.mate.caja.window-state");
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index e5273293..394e43c4 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -2770,7 +2770,7 @@ caja_icon_canvas_item_class_init (CajaIconCanvasItemClass *class)
g_param_spec_boolean ("highlighted_for_selection",
"highlighted for selection",
"whether we are highlighted for a selection",
- FALSE, G_PARAM_READWRITE));
+ FALSE, G_PARAM_READWRITE));
g_object_class_install_property (
object_class,
@@ -2778,7 +2778,7 @@ caja_icon_canvas_item_class_init (CajaIconCanvasItemClass *class)
g_param_spec_boolean ("highlighted_as_keyboard_focus",
"highlighted as keyboard focus",
"whether we are highlighted to render keyboard focus",
- FALSE, G_PARAM_READWRITE));
+ FALSE, G_PARAM_READWRITE));
g_object_class_install_property (
@@ -3510,7 +3510,7 @@ caja_icon_canvas_item_accessible_ref_state_set (AtkObject *accessible)
l = container->details->icons;
while (l) {
icon = l->data;
-
+
if (icon->item == item) {
if (icon->is_selected) {
one_item_selected = TRUE;
diff --git a/libcaja-private/caja-undostack-manager.c b/libcaja-private/caja-undostack-manager.c
index e875803f..c80b4f79 100644
--- a/libcaja-private/caja-undostack-manager.c
+++ b/libcaja-private/caja-undostack-manager.c
@@ -795,22 +795,22 @@ get_all_trashed_items (GQueue *stack)
while ((action = (CajaUndoStackActionData *) g_queue_pop_tail (tmp_stack)) != NULL)
if (action->trashed)
- for (l = g_hash_table_get_keys (action->trashed); l != NULL; l=l->next) {
+ for (l = g_hash_table_get_keys (action->trashed); l != NULL; l=l->next) {
trash = g_list_append(trash, l->data);
}
-
+
g_queue_free (tmp_stack);
return (trash);
}
-static gboolean
+static gboolean
is_destination_uri_action_partof_trashed(GList *trash, GList *g)
{
GList *l;
char *uri;
- for (l = trash; l != NULL; l=l->next) {
- for (; g != NULL; g=g->next) {
+ for (l = trash; l != NULL; l=l->next) {
+ for (; g != NULL; g=g->next) {
//printf ("destinations: %s\n", g_file_get_uri(l->data));
uri = g_file_get_uri(g->data);
if (!strcmp (uri, l->data)) {
diff --git a/libcaja-private/caja-undostack-manager.h b/libcaja-private/caja-undostack-manager.h
index df08d58c..9538096c 100644
--- a/libcaja-private/caja-undostack-manager.h
+++ b/libcaja-private/caja-undostack-manager.h
@@ -82,7 +82,7 @@ typedef struct _CajaUndoStackManager
typedef struct _CajaUndoStackManagerClass
{
GObjectClass parent_class;
-
+
} CajaUndoStackManagerClass;
#define TYPE_CAJA_UNDOSTACK_MANAGER (caja_undostack_manager_get_type())
@@ -101,7 +101,7 @@ typedef struct _CajaUndoStackManagerClass
#define CAJA_UNDOSTACK_MANAGER_GET_CLASS(object) \
(G_TYPE_INSTANCE_GET_CLASS((object), TYPE_CAJA_UNDOSTACK_MANAGER, CajaUndoStackManagerClass))
-
+
GType
caja_undostack_manager_get_type (void);
@@ -163,22 +163,22 @@ caja_undostack_manager_request_menu_update(CajaUndoStackManager* manager);
void
caja_undostack_manager_data_add_file_permissions(
CajaUndoStackActionData* data, GFile* file, guint32 permission);
-
+
void
caja_undostack_manager_data_set_recursive_permissions(
CajaUndoStackActionData* data, guint32 file_permissions, guint32 file_mask,
guint32 dir_permissions, guint32 dir_mask);
-
+
void
caja_undostack_manager_data_set_file_permissions(
CajaUndoStackActionData* data, char* uri, guint32 current_permissions, guint32 new_permissions);
-
+
void
caja_undostack_manager_data_set_owner_change_information(
CajaUndoStackActionData* data, char* uri, const char* current_user, const char* new_user);
-
+
void
caja_undostack_manager_data_set_group_change_information(
- CajaUndoStackActionData* data, char* uri, const char* current_group, const char* new_group);
+ CajaUndoStackActionData* data, char* uri, const char* current_group, const char* new_group);
#endif /* CAJA_UNDOSTACK_MANAGER_H */
diff --git a/libcaja-private/caja-window-info.c b/libcaja-private/caja-window-info.c
index cce05f7d..9318847f 100644
--- a/libcaja-private/caja-window-info.c
+++ b/libcaja-private/caja-window-info.c
@@ -90,7 +90,7 @@ caja_window_info_base_init (gpointer g_class)
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
-
+
initialized = TRUE;
}
}
diff --git a/libcaja-private/caja-window-info.h b/libcaja-private/caja-window-info.h
index ea2d23c6..00286e40 100644
--- a/libcaja-private/caja-window-info.h
+++ b/libcaja-private/caja-window-info.h
@@ -156,7 +156,7 @@ extern "C" {
(* get_backup_files_mode) (CajaWindowInfo *window);
void (* set_backup_files_mode) (CajaWindowInfo *window,
CajaWindowShowBackupFilesMode mode);
-
+
CajaWindowSlotInfo * (* get_active_slot) (CajaWindowInfo *window);
CajaWindowSlotInfo * (* get_extra_slot) (CajaWindowInfo *window);
@@ -197,7 +197,7 @@ extern "C" {
CajaWindowShowBackupFilesMode caja_window_info_get_backup_files_mode (CajaWindowInfo *window);
void caja_window_info_set_backup_files_mode (CajaWindowInfo *window,
CajaWindowShowBackupFilesMode mode);
-
+
gboolean caja_window_info_get_initiated_unmount (CajaWindowInfo *window);
void caja_window_info_set_initiated_unmount (CajaWindowInfo *window,
gboolean initiated_unmount);