summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-autorun.c5
-rw-r--r--libcaja-private/caja-bookmark.c2
-rw-r--r--libcaja-private/caja-bookmark.h1
-rw-r--r--libcaja-private/caja-cell-renderer-text-ellipsized.h1
-rw-r--r--libcaja-private/caja-clipboard-monitor.h2
-rw-r--r--libcaja-private/caja-clipboard.c1
-rw-r--r--libcaja-private/caja-column-chooser.c1
-rw-r--r--libcaja-private/caja-column-utilities.h1
-rw-r--r--libcaja-private/caja-customization-data.c9
-rw-r--r--libcaja-private/caja-customization-data.h6
-rw-r--r--libcaja-private/caja-desktop-directory-file.c5
-rw-r--r--libcaja-private/caja-desktop-directory.c5
-rw-r--r--libcaja-private/caja-desktop-icon-file.c1
-rw-r--r--libcaja-private/caja-desktop-link-monitor.c4
-rw-r--r--libcaja-private/caja-desktop-link.c1
-rw-r--r--libcaja-private/caja-desktop-link.h1
-rw-r--r--libcaja-private/caja-directory-async.c14
-rw-r--r--libcaja-private/caja-directory.c3
-rw-r--r--libcaja-private/caja-directory.h2
-rw-r--r--libcaja-private/caja-dnd.c7
-rw-r--r--libcaja-private/caja-emblem-utils.c2
-rw-r--r--libcaja-private/caja-emblem-utils.h1
-rw-r--r--libcaja-private/caja-entry.c1
-rw-r--r--libcaja-private/caja-extensions.c1
-rw-r--r--libcaja-private/caja-file-changes-queue.c1
-rw-r--r--libcaja-private/caja-file-changes-queue.h1
-rw-r--r--libcaja-private/caja-file-operations.c36
-rw-r--r--libcaja-private/caja-file-private.h3
-rw-r--r--libcaja-private/caja-file-queue.c1
-rw-r--r--libcaja-private/caja-file-utilities.c6
-rw-r--r--libcaja-private/caja-file.c37
-rw-r--r--libcaja-private/caja-file.h4
-rw-r--r--libcaja-private/caja-global-preferences.h3
-rw-r--r--libcaja-private/caja-icon-canvas-item.c12
-rw-r--r--libcaja-private/caja-icon-container.c23
-rw-r--r--libcaja-private/caja-icon-container.h4
-rw-r--r--libcaja-private/caja-icon-dnd.c7
-rw-r--r--libcaja-private/caja-icon-dnd.h1
-rw-r--r--libcaja-private/caja-icon-info.c3
-rw-r--r--libcaja-private/caja-icon-info.h4
-rw-r--r--libcaja-private/caja-icon-private.h3
-rw-r--r--libcaja-private/caja-keep-last-vertical-box.c1
-rw-r--r--libcaja-private/caja-link.c5
-rw-r--r--libcaja-private/caja-mime-actions.c17
-rw-r--r--libcaja-private/caja-mime-actions.h1
-rw-r--r--libcaja-private/caja-mime-application-chooser.c1
-rw-r--r--libcaja-private/caja-module.h1
-rw-r--r--libcaja-private/caja-open-with-dialog.c10
-rw-r--r--libcaja-private/caja-open-with-dialog.h2
-rw-r--r--libcaja-private/caja-progress-info.c2
-rw-r--r--libcaja-private/caja-progress-info.h1
-rw-r--r--libcaja-private/caja-query.c6
-rw-r--r--libcaja-private/caja-recent.h1
-rw-r--r--libcaja-private/caja-saved-search-file.c1
-rw-r--r--libcaja-private/caja-saved-search-file.h1
-rw-r--r--libcaja-private/caja-search-directory-file.c2
-rw-r--r--libcaja-private/caja-search-directory.c4
-rw-r--r--libcaja-private/caja-search-engine-beagle.c1
-rw-r--r--libcaja-private/caja-search-engine-simple.c5
-rw-r--r--libcaja-private/caja-search-engine-tracker.c11
-rw-r--r--libcaja-private/caja-search-engine.c3
-rw-r--r--libcaja-private/caja-sidebar-provider.c1
-rw-r--r--libcaja-private/caja-sidebar.c1
-rw-r--r--libcaja-private/caja-sidebar.h1
-rw-r--r--libcaja-private/caja-thumbnails.c4
-rw-r--r--libcaja-private/caja-thumbnails.h1
-rw-r--r--libcaja-private/caja-tree-view-drag-dest.c5
-rw-r--r--libcaja-private/caja-ui-utilities.c1
-rw-r--r--libcaja-private/caja-vfs-file.c2
-rw-r--r--libcaja-private/caja-view-factory.c2
-rw-r--r--libcaja-private/caja-view-factory.h4
-rw-r--r--libcaja-private/caja-view.c2
-rw-r--r--libcaja-private/caja-view.h2
-rw-r--r--libcaja-private/caja-window-info.h1
-rw-r--r--libcaja-private/caja-window-slot-info.h2
75 files changed, 0 insertions, 331 deletions
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 17b9d9fc..2f79b16b 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -147,7 +147,6 @@ add_elem_to_str_array (char **v, const char *s)
return r;
}
-
void
caja_autorun_set_preferences (const char *x_content_type,
gboolean pref_start_app,
@@ -801,7 +800,6 @@ typedef struct
gpointer user_data;
} AutorunDialogData;
-
void
caja_autorun_launch_for_mount (GMount *mount, GAppInfo *app_info)
{
@@ -916,7 +914,6 @@ autorun_combo_changed (gboolean selected_ask,
data->selected_open_folder = selected_open_folder;
}
-
static void
autorun_always_toggled (GtkToggleButton *togglebutton, AutorunDialogData *data)
{
@@ -1041,7 +1038,6 @@ show_dialog:
label = gtk_label_new (NULL);
-
/* Customize greeting for well-known x-content types */
if (strcmp (x_content_type, "x-content/audio-cdda") == 0)
{
@@ -1358,7 +1354,6 @@ caja_autorun_get_x_content_types_for_mount_async (GMount *mount,
data);
}
-
char **
caja_autorun_get_cached_x_content_types_for_mount (GMount *mount)
{
diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c
index 7fb0b485..587e8cc9 100644
--- a/libcaja-private/caja-bookmark.c
+++ b/libcaja-private/caja-bookmark.c
@@ -203,7 +203,6 @@ caja_bookmark_get_name (CajaBookmark *bookmark)
return g_strdup (bookmark->details->name);
}
-
gboolean
caja_bookmark_get_has_custom_name (CajaBookmark *bookmark)
{
@@ -283,7 +282,6 @@ caja_bookmark_get_uri (CajaBookmark *bookmark)
return uri;
}
-
/**
* caja_bookmark_set_name:
*
diff --git a/libcaja-private/caja-bookmark.h b/libcaja-private/caja-bookmark.h
index e8c09149..e1913bf5 100644
--- a/libcaja-private/caja-bookmark.h
+++ b/libcaja-private/caja-bookmark.h
@@ -91,7 +91,6 @@ void caja_bookmark_set_scroll_pos (CajaBookmark *b
const char *uri);
char * caja_bookmark_get_scroll_pos (CajaBookmark *bookmark);
-
/* Helper functions for displaying bookmarks */
cairo_surface_t * caja_bookmark_get_surface (CajaBookmark *bookmark,
GtkIconSize icon_size);
diff --git a/libcaja-private/caja-cell-renderer-text-ellipsized.h b/libcaja-private/caja-cell-renderer-text-ellipsized.h
index 28e2bc9a..8997b831 100644
--- a/libcaja-private/caja-cell-renderer-text-ellipsized.h
+++ b/libcaja-private/caja-cell-renderer-text-ellipsized.h
@@ -41,7 +41,6 @@
#define CAJA_CELL_RENDERER_TEXT_ELLIPSIZED_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_CELL_RENDERER_TEXT_ELLIPSIZED, CajaCellRendererTextEllipsizedClass))
-
typedef struct _CajaCellRendererTextEllipsized CajaCellRendererTextEllipsized;
typedef struct _CajaCellRendererTextEllipsizedClass CajaCellRendererTextEllipsizedClass;
diff --git a/libcaja-private/caja-clipboard-monitor.h b/libcaja-private/caja-clipboard-monitor.h
index b378a778..8c3d406c 100644
--- a/libcaja-private/caja-clipboard-monitor.h
+++ b/libcaja-private/caja-clipboard-monitor.h
@@ -79,7 +79,5 @@ void caja_get_clipboard_callback (GtkClipboard *clipboard,
guint info,
gpointer user_data);
-
-
#endif /* CAJA_CLIPBOARD_MONITOR_H */
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c
index 1821d6ad..307072bf 100644
--- a/libcaja-private/caja-clipboard.c
+++ b/libcaja-private/caja-clipboard.c
@@ -160,7 +160,6 @@ received_clipboard_contents (GtkClipboard *clipboard,
g_object_unref (action_group);
}
-
static void
set_paste_sensitive_if_clipboard_contains_data (GtkActionGroup *action_group)
{
diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c
index 0c50f2d0..a14e1cc5 100644
--- a/libcaja-private/caja-column-chooser.c
+++ b/libcaja-private/caja-column-chooser.c
@@ -566,7 +566,6 @@ get_column_iter (CajaColumnChooser *chooser,
{
char *name;
-
gtk_tree_model_get (GTK_TREE_MODEL (chooser->details->store),
iter,
COLUMN_NAME, &name,
diff --git a/libcaja-private/caja-column-utilities.h b/libcaja-private/caja-column-utilities.h
index b78c80b8..09cf9475 100644
--- a/libcaja-private/caja-column-utilities.h
+++ b/libcaja-private/caja-column-utilities.h
@@ -38,5 +38,4 @@ void caja_column_list_free (GList *columns);
GList *caja_sort_columns (GList *columns,
char **column_order);
-
#endif /* CAJA_COLUMN_UTILITIES_H */
diff --git a/libcaja-private/caja-customization-data.c b/libcaja-private/caja-customization-data.c
index 0a0d540c..8ed9566f 100644
--- a/libcaja-private/caja-customization-data.c
+++ b/libcaja-private/caja-customization-data.c
@@ -70,7 +70,6 @@ struct CajaCustomizationData
guint reading_mode : 2; /* enough bits for CustomizationReadingMode */
};
-
/* The Property here should be one of "emblems", "colors" or "patterns" */
static char * get_global_customization_path (const char *customization_name);
static char * get_private_customization_path (const char *customization_name);
@@ -79,7 +78,6 @@ static char * get_file_path_for_mode (const CajaCustomiz
static char* format_name_for_display (CajaCustomizationData *data, const char *name);
static void load_name_map_hash_table (CajaCustomizationData *data);
-
static gboolean
read_all_children (char *filename,
const char *attributes,
@@ -116,7 +114,6 @@ read_all_children (char *filename,
return TRUE;
}
-
CajaCustomizationData*
caja_customization_data_new (const char *customization_name,
gboolean show_public_customizations,
@@ -231,7 +228,6 @@ caja_customization_data_get_next_element_for_display (CajaCustomizationData *dat
}
}
-
current_file_info = data->current_file_list->data;
data->current_file_list = data->current_file_list->next;
@@ -321,7 +317,6 @@ caja_customization_data_destroy (CajaCustomizationData *data)
g_free (data);
}
-
/* get_global_customization_directory
Get the path where a property's pixmaps are stored
@customization_name : the name of the customization to get.
@@ -337,7 +332,6 @@ get_global_customization_path (const char *customization_name)
NULL);
}
-
/* get_private_customization_directory
Get the path where a customization's pixmaps are stored
@customization_name : the name of the customization to get.
@@ -360,7 +354,6 @@ get_private_customization_path (const char *customization_name)
return directory_path;
}
-
static char *
get_file_path_for_mode (const CajaCustomizationData *data,
const char *file_name)
@@ -381,7 +374,6 @@ get_file_path_for_mode (const CajaCustomizationData *data,
return file;
}
-
/* utility to make an attractive pattern image by compositing with a frame */
GdkPixbuf*
caja_customization_make_pattern_chit (GdkPixbuf *pattern_tile, GdkPixbuf *frame, gboolean dragging, gboolean is_reset)
@@ -421,7 +413,6 @@ caja_customization_make_pattern_chit (GdkPixbuf *pattern_tile, GdkPixbuf *frame,
return pixbuf;
}
-
/* utility to format the passed-in name for display by stripping the extension, mapping underscore
and capitalizing as necessary */
diff --git a/libcaja-private/caja-customization-data.h b/libcaja-private/caja-customization-data.h
index b2294b8d..5c56e04f 100644
--- a/libcaja-private/caja-customization-data.h
+++ b/libcaja-private/caja-customization-data.h
@@ -25,8 +25,6 @@
/* caja-customization-data.h - functions to collect and load property
names and imges */
-
-
#ifndef CAJA_CUSTOMIZATION_DATA_H
#define CAJA_CUSTOMIZATION_DATA_H
@@ -37,8 +35,6 @@
typedef struct CajaCustomizationData CajaCustomizationData;
-
-
CajaCustomizationData* caja_customization_data_new (const char *customization_name,
gboolean show_public_customizations,
int maximum_icon_height,
@@ -58,8 +54,6 @@ gboolean caja_customization_data_private_data_was_displayed
void caja_customization_data_destroy (CajaCustomizationData *data);
-
-
GdkPixbuf* caja_customization_make_pattern_chit (GdkPixbuf *pattern_tile,
GdkPixbuf *frame,
gboolean dragging,
diff --git a/libcaja-private/caja-desktop-directory-file.c b/libcaja-private/caja-desktop-directory-file.c
index 2c9faba8..ff84cfc7 100644
--- a/libcaja-private/caja-desktop-directory-file.c
+++ b/libcaja-private/caja-desktop-directory-file.c
@@ -73,7 +73,6 @@ typedef struct
CajaFileAttributes non_delegated_attributes;
} DesktopMonitor;
-
static void caja_desktop_directory_file_init (gpointer object,
gpointer klass);
static void caja_desktop_directory_file_class_init (gpointer klass);
@@ -105,7 +104,6 @@ desktop_callback_equal (gconstpointer desktop_callback_as_pointer,
&& desktop_callback->callback_data == desktop_callback_2->callback_data;
}
-
static void
real_file_changed_callback (CajaFile *real_file,
gpointer callback_data)
@@ -458,7 +456,6 @@ desktop_directory_file_get_where_string (CajaFile *file)
return g_strdup (_("on the desktop"));
}
-
static void
monitor_destroy (gpointer data)
{
@@ -515,7 +512,6 @@ caja_desktop_directory_file_init (gpointer object, gpointer klass)
G_CALLBACK (real_file_changed_callback), desktop_file, 0);
}
-
static void
desktop_callback_remove_file_cover (gpointer key,
gpointer value,
@@ -525,7 +521,6 @@ desktop_callback_remove_file_cover (gpointer key,
(value, CAJA_FILE (callback_data));
}
-
static void
desktop_finalize (GObject *object)
{
diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c
index 1c602e80..ad58c751 100644
--- a/libcaja-private/caja-desktop-directory.c
+++ b/libcaja-private/caja-desktop-directory.c
@@ -57,7 +57,6 @@ typedef struct
GList *merged_file_list;
} MergedCallback;
-
typedef struct
{
CajaDesktopDirectory *desktop_dir;
@@ -211,7 +210,6 @@ desktop_call_when_ready (CajaDirectory *directory,
merged_callback->non_ready_directories = g_list_prepend
(merged_callback->non_ready_directories, desktop->details->real_directory);
-
merged_callback->merged_file_list = g_list_concat (NULL,
caja_file_list_copy (directory->details->file_list));
@@ -342,7 +340,6 @@ desktop_monitor_add (CajaDirectory *directory,
merged_callback_list = g_list_concat (merged_callback_list,
caja_file_list_copy (directory->details->file_list));
-
if (callback != NULL)
{
(* callback) (directory, merged_callback_list, callback_data);
@@ -430,7 +427,6 @@ caja_desktop_directory_get_real_directory (CajaDesktopDirectory *desktop)
return desktop->details->real_directory;
}
-
static void
desktop_finalize (GObject *object)
{
@@ -458,7 +454,6 @@ done_loading_callback (CajaDirectory *real_directory,
caja_directory_emit_done_loading (CAJA_DIRECTORY (desktop));
}
-
static void
forward_files_added_cover (CajaDirectory *real_directory,
GList *files,
diff --git a/libcaja-private/caja-desktop-icon-file.c b/libcaja-private/caja-desktop-icon-file.c
index 082fdca3..065e4e8e 100644
--- a/libcaja-private/caja-desktop-icon-file.c
+++ b/libcaja-private/caja-desktop-icon-file.c
@@ -48,7 +48,6 @@ struct _CajaDesktopIconFilePrivate
G_DEFINE_TYPE_WITH_PRIVATE (CajaDesktopIconFile, caja_desktop_icon_file, CAJA_TYPE_FILE)
-
static void
desktop_icon_file_monitor_add (CajaFile *file,
gconstpointer client,
diff --git a/libcaja-private/caja-desktop-link-monitor.c b/libcaja-private/caja-desktop-link-monitor.c
index 0d5da061..dde3471e 100644
--- a/libcaja-private/caja-desktop-link-monitor.c
+++ b/libcaja-private/caja-desktop-link-monitor.c
@@ -59,7 +59,6 @@ struct CajaDesktopLinkMonitorDetails
GList *mount_links;
};
-
static void caja_desktop_link_monitor_init (gpointer object,
gpointer klass);
static void caja_desktop_link_monitor_class_init (gpointer klass);
@@ -201,8 +200,6 @@ remove_mount_link (CajaDesktopLinkMonitor *monitor,
}
}
-
-
static void
mount_added_callback (GVolumeMonitor *volume_monitor,
GMount *mount,
@@ -211,7 +208,6 @@ mount_added_callback (GVolumeMonitor *volume_monitor,
create_mount_link (monitor, mount);
}
-
static void
mount_removed_callback (GVolumeMonitor *volume_monitor,
GMount *mount,
diff --git a/libcaja-private/caja-desktop-link.c b/libcaja-private/caja-desktop-link.c
index 7b001884..eb436556 100644
--- a/libcaja-private/caja-desktop-link.c
+++ b/libcaja-private/caja-desktop-link.c
@@ -390,7 +390,6 @@ caja_desktop_link_get_activation_uri (CajaDesktopLink *link)
return NULL;
}
-
gboolean
caja_desktop_link_get_date (CajaDesktopLink *link,
CajaDateType date_type,
diff --git a/libcaja-private/caja-desktop-link.h b/libcaja-private/caja-desktop-link.h
index a35cda19..56777b99 100644
--- a/libcaja-private/caja-desktop-link.h
+++ b/libcaja-private/caja-desktop-link.h
@@ -81,5 +81,4 @@ gboolean caja_desktop_link_can_rename (CajaDesktopLi
gboolean caja_desktop_link_rename (CajaDesktopLink *link,
const char *name);
-
#endif /* CAJA_DESKTOP_LINK_H */
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index 8a9c021c..b1fc572b 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -151,8 +151,6 @@ struct DeepCountState
char *fs_id;
};
-
-
typedef struct
{
CajaFile *file; /* Which file, NULL means all. */
@@ -838,7 +836,6 @@ caja_directory_monitor_add_internal (CajaDirectory *directory,
directory->details->monitor = caja_monitor_directory (directory->details->location);
}
-
if (REQUEST_WANTS_TYPE (monitor->request, REQUEST_FILE_INFO) &&
directory->details->mime_db_monitor == 0)
{
@@ -2116,7 +2113,6 @@ caja_directory_has_active_request_for_file (CajaDirectory *directory,
return FALSE;
}
-
/* This checks if there's a request for monitoring the file list. */
gboolean
caja_directory_is_anyone_monitoring_file_list (CajaDirectory *directory)
@@ -2278,7 +2274,6 @@ enumerate_children_callback (GObject *source_object,
}
}
-
/* Start monitoring the file list if it isn't already. */
static void
start_monitoring_file_list (CajaDirectory *directory)
@@ -2371,7 +2366,6 @@ caja_file_invalidate_count_and_mime_list (CajaFile *file)
caja_file_invalidate_attributes (file, attributes);
}
-
/* Reset count and mime list. Invalidating deep counts is handled by
* itself elsewhere because it's a relatively heavyweight and
* special-purpose operation (see bug 5863). Also, the shallow count
@@ -3045,7 +3039,6 @@ deep_count_callback (GObject *source_object,
}
}
-
static void
deep_count_load (DeepCountState *state, GFile *location)
{
@@ -3222,7 +3215,6 @@ mime_list_state_free (MimeListState *state)
g_free (state);
}
-
static void
mime_list_done (MimeListState *state, gboolean success)
{
@@ -3432,7 +3424,6 @@ mime_list_start (CajaDirectory *directory,
return;
}
-
state = g_new0 (MimeListState, 1);
state->mime_list_file = file;
state->directory = caja_directory_ref (directory);
@@ -4291,7 +4282,6 @@ get_pixbuf_for_content (goffset file_len,
return pixbuf;
}
-
static void
thumbnail_read_callback (GObject *source_object,
GAsyncResult *res,
@@ -4828,7 +4818,6 @@ finish_info_provider (CajaDirectory *directory,
}
}
-
static gboolean
info_provider_idle_callback (gpointer user_data)
{
@@ -5177,7 +5166,6 @@ cancel_link_info_for_file (CajaDirectory *directory,
}
}
-
static void
cancel_loading_attributes (CajaDirectory *directory,
CajaFileAttributes file_attributes)
@@ -5294,7 +5282,6 @@ caja_directory_add_file_to_work_queue (CajaDirectory *directory,
file);
}
-
static void
add_all_files_to_work_queue (CajaDirectory *directory)
{
@@ -5322,7 +5309,6 @@ caja_directory_remove_file_from_work_queue (CajaDirectory *directory,
file);
}
-
static void
move_file_to_low_priority_queue (CajaDirectory *directory,
CajaFile *file)
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index 1bb1518b..d3f75ff3 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -320,7 +320,6 @@ caja_directory_get_existing (GFile *location)
return caja_directory_get_internal (location, FALSE);
}
-
CajaDirectory *
caja_directory_get_by_uri (const char *uri)
{
@@ -885,7 +884,6 @@ caja_directory_notify_files_added (GList *files)
* we must invalidate it's item count.
*/
-
file = NULL;
parent = g_file_get_parent (location);
if (parent)
@@ -1554,7 +1552,6 @@ caja_directory_match_pattern (CajaDirectory *directory, const char *pattern)
GList *files, *l, *ret;
GPatternSpec *spec;
-
ret = NULL;
spec = g_pattern_spec_new (pattern);
diff --git a/libcaja-private/caja-directory.h b/libcaja-private/caja-directory.h
index b375e015..6d08b14f 100644
--- a/libcaja-private/caja-directory.h
+++ b/libcaja-private/caja-directory.h
@@ -188,7 +188,6 @@ void caja_directory_cancel_callback (CajaDirectory
CajaDirectoryCallback callback,
gpointer callback_data);
-
/* Monitor the files in a directory. */
void caja_directory_file_monitor_add (CajaDirectory *directory,
gconstpointer client,
@@ -206,7 +205,6 @@ GList * caja_directory_get_file_list (CajaDirectory
GList * caja_directory_match_pattern (CajaDirectory *directory,
const char *glob);
-
/* Return true if the directory has information about all the files.
* This will be false until the directory has been read at least once.
*/
diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c
index 9da1a382..65918b08 100644
--- a/libcaja-private/caja-dnd.c
+++ b/libcaja-private/caja-dnd.c
@@ -92,7 +92,6 @@ caja_drag_finalize (CajaDragInfo *drag_info)
g_free (drag_info);
}
-
/* Functions to deal with CajaDragSelectionItems. */
CajaDragSelectionItem *
@@ -929,7 +928,6 @@ caja_drag_autoscroll_in_scroll_region (GtkWidget *widget)
return x_scroll_delta != 0 || y_scroll_delta != 0;
}
-
void
caja_drag_autoscroll_calculate_delta (GtkWidget *widget, float *x_scroll_delta, float *y_scroll_delta)
{
@@ -1017,8 +1015,6 @@ caja_drag_autoscroll_calculate_delta (GtkWidget *widget, float *x_scroll_delta,
}
-
-
void
caja_drag_autoscroll_start (CajaDragInfo *drag_info,
GtkWidget *widget,
@@ -1240,7 +1236,6 @@ slot_proxy_drag_drop (GtkWidget *widget,
return TRUE;
}
-
static void
slot_proxy_handle_drop (GtkWidget *widget,
GdkDragContext *context,
@@ -1318,7 +1313,6 @@ slot_proxy_handle_drop (GtkWidget *widget,
gdk_drag_context_get_selected_action (context));
}
-
gtk_drag_finish (context, TRUE, FALSE, time);
}
else
@@ -1429,4 +1423,3 @@ caja_drag_slot_proxy_init (GtkWidget *widget,
drag_info);
}
-
diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c
index 2f4aa054..e14afc46 100644
--- a/libcaja-private/caja-emblem-utils.c
+++ b/libcaja-private/caja-emblem-utils.c
@@ -76,7 +76,6 @@ caja_emblem_get_icon_name_from_keyword (const char *keyword)
return g_strconcat ("emblem-", keyword, NULL);
}
-
/* check for reserved keywords */
static gboolean
is_reserved_keyword (const char *keyword)
@@ -464,7 +463,6 @@ caja_emblem_rename_emblem (const char *keyword, const char *name)
return FALSE;
}
-
/* write the new icon description */
fprintf (file, "\n[Icon Data]\n\nDisplayName=%s\n", name);
fflush (file);
diff --git a/libcaja-private/caja-emblem-utils.h b/libcaja-private/caja-emblem-utils.h
index c524a4f9..6ebeef58 100644
--- a/libcaja-private/caja-emblem-utils.h
+++ b/libcaja-private/caja-emblem-utils.h
@@ -54,6 +54,5 @@ gboolean caja_emblem_can_rename_emblem (const char *keyword);
char * caja_emblem_create_unique_keyword (const char *base);
-
#endif /* __CAJA_EMBLEM_UTILS_H__ */
diff --git a/libcaja-private/caja-entry.c b/libcaja-private/caja-entry.c
index 7c1db0b9..bb86fd18 100644
--- a/libcaja-private/caja-entry.c
+++ b/libcaja-private/caja-entry.c
@@ -418,4 +418,3 @@ caja_entry_set_special_tab_handling (CajaEntry *entry,
entry->details->special_tab_handling = special_tab_handling;
}
-
diff --git a/libcaja-private/caja-extensions.c b/libcaja-private/caja-extensions.c
index 804bb492..59d1f8c6 100644
--- a/libcaja-private/caja-extensions.c
+++ b/libcaja-private/caja-extensions.c
@@ -33,7 +33,6 @@
static GList *caja_extensions = NULL;
-
static Extension *
extension_new (gchar *filename, gboolean state, gboolean python, GObject *module)
{
diff --git a/libcaja-private/caja-file-changes-queue.c b/libcaja-private/caja-file-changes-queue.c
index 20363723..9f59a1ef 100644
--- a/libcaja-private/caja-file-changes-queue.c
+++ b/libcaja-private/caja-file-changes-queue.c
@@ -266,7 +266,6 @@ caja_file_changes_consume_changes (gboolean consume_all)
CajaFileChangesQueue *queue;
gboolean flush_needed;
-
additions = NULL;
changes = NULL;
deletions = NULL;
diff --git a/libcaja-private/caja-file-changes-queue.h b/libcaja-private/caja-file-changes-queue.h
index 0d159158..506e0740 100644
--- a/libcaja-private/caja-file-changes-queue.h
+++ b/libcaja-private/caja-file-changes-queue.h
@@ -38,5 +38,4 @@ void caja_file_changes_queue_schedule_position_remove (GFile *locati
void caja_file_changes_consume_changes (gboolean consume_all);
-
#endif /* CAJA_FILE_CHANGES_QUEUE_H */
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index b77bdd7d..b0c15cdb 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -124,7 +124,6 @@ typedef struct {
gpointer done_callback_data;
} CreateJob;
-
typedef struct {
CommonJob common;
GList *trash_dirs;
@@ -242,7 +241,6 @@ static void scan_sources (GList *files,
CommonJob *job,
OpKind kind);
-
static gboolean empty_trash_job (GIOSchedulerJob *io_job,
GCancellable *cancellable,
gpointer user_data);
@@ -466,7 +464,6 @@ get_link_name (const char *name, int count, int max_length)
return result;
}
-
/* Translators:
* Feel free to leave out the st, nd, rd and th suffix or
* make some or all of them match.
@@ -588,7 +585,6 @@ parse_previous_duplicate_name (const char *name,
return;
}
-
tag = strstr (name, ANOTHER_COPY_DUPLICATE_TAG);
if (tag != NULL) {
if (tag > *suffix) {
@@ -600,7 +596,6 @@ parse_previous_duplicate_name (const char *name,
return;
}
-
/* Check to see if we got one of st, nd, rd, th. */
tag = strstr (name, X11TH_COPY_DUPLICATE_TAG);
@@ -647,7 +642,6 @@ parse_previous_duplicate_name (const char *name,
}
}
-
*count = 0;
if (**suffix != '\0') {
*name_base = extract_string_until (name, *suffix);
@@ -796,7 +790,6 @@ has_invalid_xml_char (char *str)
return FALSE;
}
-
static char *
custom_full_name_to_string (char *format, va_list va)
{
@@ -858,7 +851,6 @@ custom_basename_to_string (char *format, va_list va)
g_free (tmp);
}
-
return name;
}
@@ -868,7 +860,6 @@ custom_basename_skip (va_list *va)
(void) va_arg (*va, GFile *);
}
-
static char *
custom_size_to_string (char *format, va_list va)
{
@@ -918,7 +909,6 @@ custom_mount_skip (va_list *va)
(void) va_arg (*va, GMount *);
}
-
static EelPrintfHandler handlers[] = {
{ 'F', custom_full_name_to_string, custom_full_name_skip },
{ 'B', custom_basename_to_string, custom_basename_skip },
@@ -928,7 +918,6 @@ static EelPrintfHandler handlers[] = {
{ 0 }
};
-
static char *
f (const char *format, ...) {
va_list va;
@@ -1854,7 +1843,6 @@ report_trash_progress (CommonJob *job,
}
}
-
static void
trash_files (CommonJob *job, GList *files, int *files_skipped)
{
@@ -2129,8 +2117,6 @@ caja_file_operations_delete (GList *files,
done_callback, done_callback_data);
}
-
-
typedef struct {
gboolean eject;
GMount *mount;
@@ -2242,7 +2228,6 @@ dir_has_files (GFile *dir)
g_object_unref (enumerator);
}
-
return res;
}
@@ -2312,7 +2297,6 @@ has_trash_files (GMount *mount)
return res;
}
-
static gint
prompt_empty_trash (GtkWindow *parent_window)
{
@@ -2487,7 +2471,6 @@ volume_mount_cb (GObject *source_object,
g_object_unref (mount_op);
}
-
void
caja_file_operations_mount_volume (GtkWindow *parent_window,
GVolume *volume,
@@ -4168,7 +4151,6 @@ copy_move_file (CopyMoveJob *copy_job,
dest = get_target_file (src, dest_dir, *dest_fs_type, same_fs);
}
-
/* Don't allow recursive move/copy into itself.
* (We would get a file system error if we proceeded but it is nicer to
* detect and report it at this level) */
@@ -4236,7 +4218,6 @@ copy_move_file (CopyMoveJob *copy_job,
goto out;
}
-
retry:
error = NULL;
flags = G_FILE_COPY_NOFOLLOW_SYMLINKS;
@@ -4589,7 +4570,6 @@ copy_files (CopyMoveJob *job,
point = NULL;
}
-
same_fs = FALSE;
if (dest_fs_id) {
same_fs = has_fs_id (src, dest_fs_id);
@@ -4861,7 +4841,6 @@ move_file_prepare (CopyMoveJob *move_job,
dest = get_target_file (src, dest_dir, *dest_fs_type, same_fs);
-
/* Don't allow recursive move/copy into itself.
* (We would get a file system error if we proceeded but it is nicer to
* detect and report it at this level) */
@@ -5093,7 +5072,6 @@ move_files_prepare (CopyMoveJob *job,
point = NULL;
}
-
same_fs = FALSE;
if (dest_fs_id) {
same_fs = has_fs_id (src, dest_fs_id);
@@ -5111,7 +5089,6 @@ move_files_prepare (CopyMoveJob *job,
*fallbacks = g_list_reverse (*fallbacks);
-
}
static void
@@ -5168,7 +5145,6 @@ move_files (CopyMoveJob *job,
}
}
-
static gboolean
move_job_done (gpointer user_data)
{
@@ -5362,7 +5338,6 @@ get_abs_path_for_symlink (GFile *file)
return abs;
}
-
static void
link_file (CopyMoveJob *job,
GFile *src, GFile *dest_dir,
@@ -5572,7 +5547,6 @@ link_job (GIOSchedulerJob *io_job,
point = NULL;
}
-
link_file (job, src, job->destination,
&dest_fs_type, job->debuting_files,
point, left);
@@ -5633,7 +5607,6 @@ caja_file_operations_link (GList *files,
job->common.cancellable);
}
-
void
caja_file_operations_duplicate (GList *files,
GArray *relative_item_points,
@@ -5731,7 +5704,6 @@ set_permissions_file (SetPermissionsJob *job,
mask = job->file_mask;
}
-
if (!job_aborted (common) &&
g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE)) {
current = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
@@ -5776,7 +5748,6 @@ set_permissions_file (SetPermissionsJob *job,
}
}
-
static gboolean
set_permissions_job (GIOSchedulerJob *io_job,
GCancellable *cancellable,
@@ -5803,8 +5774,6 @@ set_permissions_job (GIOSchedulerJob *io_job,
return FALSE;
}
-
-
void
caja_file_set_permissions_recursive (const char *directory,
guint32 file_permissions,
@@ -6396,8 +6365,6 @@ caja_file_operations_new_file (GtkWidget *parent_view,
job->common.cancellable);
}
-
-
static void
delete_trash_file (CommonJob *job,
GFile *file,
@@ -6572,7 +6539,6 @@ mark_desktop_file_trusted (CommonJob *common,
response = 0;
}
-
if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
abort_job (common);
} else if (response == 1) {
@@ -6659,7 +6625,6 @@ mark_desktop_file_trusted (CommonJob *common,
goto out;
}
-
if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE)) {
current_perms = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
new_perms = current_perms | S_IXGRP | S_IXUSR | S_IXOTH;
@@ -6760,7 +6725,6 @@ caja_self_check_file_operations (void)
{
setlocale (LC_MESSAGES, "C");
-
/* test the next duplicate name generator */
EEL_CHECK_STRING_RESULT (get_duplicate_name (" (copy)", 1, -1), " (another copy)");
EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo", 1, -1), "foo (copy)");
diff --git a/libcaja-private/caja-file-private.h b/libcaja-private/caja-file-private.h
index 315b3b98..d6044d46 100644
--- a/libcaja-private/caja-file-private.h
+++ b/libcaja-private/caja-file-private.h
@@ -249,7 +249,6 @@ typedef struct
CajaUndoStackActionData* undo_redo_data;
} CajaFileOperation;
-
CajaFile *caja_file_new_from_info (CajaDirectory *directory,
GFileInfo *info);
void caja_file_emit_changed (CajaFile *file);
@@ -264,7 +263,6 @@ gboolean caja_file_get_date (CajaFile *file
time_t *date);
void caja_file_updated_deep_count_in_progress (CajaFile *file);
-
void caja_file_clear_info (CajaFile *file);
/* Compare file's state with a fresh file info struct, return FALSE if
* no change, update file and return TRUE if the file info contains
@@ -304,7 +302,6 @@ gboolean caja_file_rename_in_progress (CajaFile
void caja_file_invalidate_extension_info_internal (CajaFile *file);
void caja_file_info_providers_done (CajaFile *file);
-
/* Thumbnailing: */
void caja_file_set_is_thumbnailing (CajaFile *file,
gboolean is_thumbnailing);
diff --git a/libcaja-private/caja-file-queue.c b/libcaja-private/caja-file-queue.c
index be7e20b6..48fd6818 100644
--- a/libcaja-private/caja-file-queue.c
+++ b/libcaja-private/caja-file-queue.c
@@ -87,7 +87,6 @@ caja_file_queue_dequeue (CajaFileQueue *queue)
return file;
}
-
void
caja_file_queue_remove (CajaFileQueue *queue,
CajaFile *file)
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index 13a300a0..825b5b30 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -82,7 +82,6 @@ caja_compute_title_for_location (GFile *location)
return title;
}
-
/**
* caja_get_user_directory:
*
@@ -187,7 +186,6 @@ typedef struct {
CajaFile* file;
} XdgDirEntry;
-
static XdgDirEntry *
parse_xdg_dirs (const char *config_file)
{
@@ -559,7 +557,6 @@ caja_get_desktop_location (void)
return res;
}
-
/**
* caja_get_desktop_directory_uri:
*
@@ -586,7 +583,6 @@ caja_get_home_directory_uri (void)
return g_filename_to_uri (g_get_home_dir (), NULL, NULL);
}
-
gboolean
caja_should_use_templates_directory (void)
{
@@ -635,7 +631,6 @@ static GFile *desktop_dir_dir = NULL;
static char *desktop_dir_filename = NULL;
static gboolean desktop_dir_changed_callback_installed = FALSE;
-
static void
desktop_dir_changed (void)
{
@@ -722,7 +717,6 @@ caja_is_root_directory (GFile *dir)
return g_file_equal (dir, root_dir);
}
-
gboolean
caja_is_desktop_directory_file (GFile *dir,
const char *file)
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 7ad7335c..a5ed4ff9 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -289,7 +289,6 @@ foreach_metadata_free (gpointer key,
return TRUE;
}
-
static void
metadata_hash_free (GHashTable *hash)
{
@@ -1153,7 +1152,6 @@ caja_file_is_media_check_automatic (CajaFile *file)
return ret;
}
-
gboolean
caja_file_can_stop (CajaFile *file)
{
@@ -3034,7 +3032,6 @@ prepend_automatic_keywords (CajaFile *file,
caja_file_unref (parent);
}
-
return names;
}
@@ -3102,7 +3099,6 @@ compare_by_emblems (CajaFile *file_1, CajaFile *file_2)
keyword_cache_2 += length + 1;
}
-
/* One or both is now NULL. */
if (*keyword_cache_1 != '\0') {
g_assert (*keyword_cache_2 == '\0');
@@ -3304,7 +3300,6 @@ compare_by_extension_segments (CajaFile *file_1, CajaFile *file_2)
gboolean is_directory_1, is_directory_2;
int segment_index;
-
/* Directories do not have an extension */
is_directory_1 = caja_file_is_directory (file_1);
is_directory_2 = caja_file_is_directory (file_2);
@@ -3659,7 +3654,6 @@ caja_file_compare_for_sort_by_attribute (CajaFile *file_1,
reversed);
}
-
/**
* caja_file_compare_name:
* @file: A file object
@@ -3682,7 +3676,6 @@ caja_file_compare_display_name (CajaFile *file,
return result;
}
-
gboolean
caja_file_is_hidden_file (CajaFile *file)
{
@@ -3894,7 +3887,6 @@ caja_file_set_metadata_list (CajaFile *file,
g_free (val);
}
-
gboolean
caja_file_get_boolean_metadata (CajaFile *file,
const char *key,
@@ -4021,7 +4013,6 @@ caja_file_set_time_metadata (CajaFile *file,
caja_file_set_metadata (file, key, NULL, metadata);
}
-
void
caja_file_set_boolean_metadata (CajaFile *file,
const char *key,
@@ -4200,7 +4191,6 @@ caja_file_has_activation_uri (CajaFile *file)
return file->details->activation_uri != NULL;
}
-
/* Return the uri associated with the passed-in file, which may not be
* the actual uri if the file is an desktop file or a caja
* xml link file.
@@ -4229,7 +4219,6 @@ caja_file_get_activation_location (CajaFile *file)
return caja_file_get_location (file);
}
-
char *
caja_file_get_drop_target_uri (CajaFile *file)
{
@@ -4343,7 +4332,6 @@ get_custom_icon (CajaFile *file)
return icon;
}
-
static guint64 cached_thumbnail_limit;
int cached_thumbnail_size;
static int show_image_thumbs;
@@ -4725,7 +4713,6 @@ caja_file_get_custom_icon (CajaFile *file)
return custom_icon;
}
-
gboolean
caja_file_get_date (CajaFile *file,
CajaDateType date_type,
@@ -5261,7 +5248,6 @@ caja_file_can_get_size (CajaFile *file)
return file->details->size == -1;
}
-
/**
* caja_file_get_size
*
@@ -5307,7 +5293,6 @@ caja_file_get_mtime (CajaFile *file)
return file->details->mtime;
}
-
static void
set_attributes_get_info_callback (GObject *source_object,
GAsyncResult *res,
@@ -5333,7 +5318,6 @@ set_attributes_get_info_callback (GObject *source_object,
}
}
-
static void
set_attributes_callback (GObject *source_object,
GAsyncResult *result,
@@ -5386,7 +5370,6 @@ caja_file_set_attributes (CajaFile *file,
g_object_unref (location);
}
-
/**
* caja_file_can_get_permissions:
*
@@ -5526,7 +5509,6 @@ caja_file_can_get_selinux_context (CajaFile *file)
return file->details->selinux_context != NULL;
}
-
/**
* caja_file_get_selinux_context:
*
@@ -5601,7 +5583,6 @@ get_real_name (const char *name, const char *gecos)
g_free (part_before_comma);
}
-
if (eel_str_is_empty (real_name)
|| eel_strcmp (name, real_name) == 0
|| eel_strcmp (capitalized_login_name, real_name) == 0) {
@@ -5948,7 +5929,6 @@ caja_get_group_names_for_user (void)
gid_t gid_list[NGROUPS_MAX + 1];
struct group *group = NULL;
-
list = NULL;
count = getgroups (NGROUPS_MAX + 1, gid_list);
@@ -6643,7 +6623,6 @@ caja_file_get_string_attribute (CajaFile *file, const char *attribute_name)
return caja_file_get_string_attribute_q (file, g_quark_from_string (attribute_name));
}
-
/**
* caja_file_get_string_attribute_with_default:
*
@@ -6915,7 +6894,6 @@ caja_file_is_launchable (CajaFile *file)
!caja_file_is_directory (file);
}
-
/**
* caja_file_get_emblem_icons
*
@@ -6974,7 +6952,6 @@ caja_file_get_emblem_icons (CajaFile *file,
}
}
-
icon_names[0] = g_strconcat ("emblem-", keyword, NULL);
icon_names[1] = keyword;
icon = g_themed_icon_new_from_names (icon_names, 2);
@@ -7017,7 +6994,6 @@ caja_file_get_emblem_pixbufs (CajaFile *file,
pixbufs = g_list_prepend (pixbufs, pixbuf);
}
-
g_object_unref (icon_info);
g_object_unref (icon);
}
@@ -7025,7 +7001,6 @@ caja_file_get_emblem_pixbufs (CajaFile *file,
return g_list_reverse (pixbufs);
-
}
static GList *
@@ -7257,7 +7232,6 @@ caja_file_get_volume_free_space (CajaFile *file)
caja_directory_unref (directory);
}
-
res = NULL;
if (directory->details->free_space != (guint64) -1)
@@ -7465,7 +7439,6 @@ caja_file_is_archive (CajaFile *file)
return FALSE;
}
-
/**
* caja_file_is_in_trash
*
@@ -7769,7 +7742,6 @@ caja_file_emit_changed (CajaFile *file)
g_assert (CAJA_IS_FILE (file));
-
/* Invalidate the emblem compare cache. -- This is not the cleanest
* place to do it but it is the one guaranteed bottleneck through
* which all change notifications pass.
@@ -8020,7 +7992,6 @@ caja_file_set_has_open_window (CajaFile *file,
}
}
-
gboolean
caja_file_is_thumbnailing (CajaFile *file)
{
@@ -8038,7 +8009,6 @@ caja_file_set_is_thumbnailing (CajaFile *file,
file->details->is_thumbnailing = is_thumbnailing;
}
-
/**
* caja_file_invalidate_attributes
*
@@ -8089,7 +8059,6 @@ caja_file_invalidate_all_attributes (CajaFile *file)
caja_file_invalidate_attributes (file, all_attributes);
}
-
/**
* caja_file_dump
*
@@ -8376,7 +8345,6 @@ caja_file_list_call_when_ready (GList *file_list,
*handle = (CajaFileListHandle *) data;
}
-
l = file_list;
while (l != NULL) {
file = CAJA_FILE (l->data);
@@ -8457,8 +8425,6 @@ try_to_make_utf8 (const char *text, int *length)
return utf8_text;
}
-
-
/* Extract the top left part of the read-in text. */
char *
caja_extract_top_left_text (const char *text,
@@ -8485,8 +8451,6 @@ caja_extract_top_left_text (const char *text,
max_cols = CAJA_FILE_TOP_LEFT_TEXT_MAXIMUM_CHARACTERS_PER_LINE;
}
-
-
text_copy = NULL;
if (text != NULL) {
/* Might be a partial utf8 character at the end if we didn't read whole file */
@@ -8841,7 +8805,6 @@ caja_self_check_file (void)
EEL_CHECK_INTEGER_RESULT (caja_directory_number_outstanding (), 0);
-
/* name checks */
file_1 = caja_file_get_by_uri ("file:///home/");
diff --git a/libcaja-private/caja-file.h b/libcaja-private/caja-file.h
index b4498bcd..7e4ca18a 100644
--- a/libcaja-private/caja-file.h
+++ b/libcaja-private/caja-file.h
@@ -118,7 +118,6 @@ typedef char * (*CajaTruncateCallback) (const char *string,
int width,
void *context);
-
#define CAJA_FILE_ATTRIBUTES_FOR_ICON (CAJA_FILE_ATTRIBUTE_INFO | CAJA_FILE_ATTRIBUTE_LINK_INFO | CAJA_FILE_ATTRIBUTE_THUMBNAIL)
typedef void CajaFileListHandle;
@@ -384,7 +383,6 @@ void caja_file_set_time_metadata (CajaFile
const char *key,
time_t time);
-
/* Attributes for file objects as user-displayable strings. */
char * caja_file_get_string_attribute (CajaFile *file,
const char *attribute_name);
@@ -444,7 +442,6 @@ gboolean caja_file_should_show (CajaFile
GList *caja_file_list_filter_hidden (GList *files,
gboolean show_hidden);
-
/* Get the URI that's used when activating the file.
* Getting this can require reading the contents of the file.
*/
@@ -460,7 +457,6 @@ char * caja_file_get_drop_target_uri (CajaFile
/* Get custom icon (if specified by metadata or link contents) */
char * caja_file_get_custom_icon (CajaFile *file);
-
GIcon *caja_file_get_gicon (CajaFile *file,
CajaFileIconFlags flags);
CajaIconInfo *caja_file_get_icon (CajaFile *file,
diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
index 83281157..ed888db7 100644
--- a/libcaja-private/caja-global-preferences.h
+++ b/libcaja-private/caja-global-preferences.h
@@ -136,15 +136,12 @@ typedef enum
#define CAJA_COMPACT_VIEW_IID "OAFIID:Caja_File_Manager_Compact_View"
#define CAJA_LIST_VIEW_IID "OAFIID:Caja_File_Manager_List_View"
-
/* Icon View */
#define CAJA_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT "default-use-tighter-layout"
#define CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL "default-zoom-level"
#define CAJA_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS "labels-beside-icons"
-
-
/* Which text attributes appear beneath icon names */
#define CAJA_PREFERENCES_ICON_VIEW_CAPTIONS "captions"
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 7ab2f705..8a11b154 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -237,7 +237,6 @@ static void draw_embedded_text (CajaIconCanvasItem
static void caja_icon_canvas_item_ensure_bounds_up_to_date (CajaIconCanvasItem *icon_item);
-
/* Object initialization function for the icon item. */
static void
caja_icon_canvas_item_init (CajaIconCanvasItem *icon_item)
@@ -732,7 +731,6 @@ caja_icon_canvas_item_set_embedded_text (CajaIconCanvasItem *item,
eel_canvas_item_request_update (EEL_CANVAS_ITEM (item));
}
-
/* Recomputes the bounding box of a icon canvas item.
* This is a generic implementation that could be used for any canvas item
* class, it has no assumptions about how the item is used.
@@ -943,7 +941,6 @@ in_single_click_mode (void)
return click_policy_auto_value == CAJA_CLICK_POLICY_SINGLE;
}
-
/* Keep these for a bit while we work on performance of draw_or_measure_label_text. */
/*
#define PERFORMANCE_TEST_DRAW_DISABLE
@@ -1466,7 +1463,6 @@ caja_icon_canvas_item_invalidate_label (CajaIconCanvasItem *item)
}
}
-
static GdkPixbuf *
get_knob_pixbuf (void)
{
@@ -1569,7 +1565,6 @@ emblem_layout_next (EmblemLayout *layout,
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
-
/* Advance to the next emblem. */
layout->emblem = layout->emblem->next;
@@ -1970,7 +1965,6 @@ caja_icon_canvas_item_draw (EelCanvasItem *item,
(g_ascii_isdigit (*(p+1)) && \
g_ascii_isdigit (*(p+2))))
-
static PangoLayout *
create_label_layout (CajaIconCanvasItem *item,
const char *text)
@@ -2091,7 +2085,6 @@ get_label_layout (PangoLayout **layout_cache,
return layout;
}
-
/* handle events */
static int
caja_icon_canvas_item_event (EelCanvasItem *item, GdkEvent *event)
@@ -2566,7 +2559,6 @@ get_icon_canvas_rectangle (CajaIconCanvasItem *item,
g_assert (CAJA_IS_ICON_CANVAS_ITEM (item));
g_assert (rect != NULL);
-
eel_canvas_w2c (EEL_CANVAS_ITEM (item)->canvas,
item->details->x,
item->details->y,
@@ -2743,7 +2735,6 @@ caja_icon_canvas_item_get_max_text_width (CajaIconCanvasItem *item)
return MAX_TEXT_WIDTH_STANDARD * canvas_item->canvas->pixels_per_unit;
}
-
}
}
@@ -2806,7 +2797,6 @@ caja_icon_canvas_item_class_init (CajaIconCanvasItemClass *class)
"whether we are highlighted to render keyboard focus",
FALSE, G_PARAM_READWRITE));
-
g_object_class_install_property (
object_class,
PROP_HIGHLIGHTED_FOR_DROP,
@@ -3129,7 +3119,6 @@ caja_icon_canvas_item_accessible_get_index_in_parent (AtkObject *accessible)
return -1;
}
-
static const gchar* caja_icon_canvas_item_accessible_get_image_description(AtkImage* image)
{
CajaIconCanvasItemAccessiblePrivate* priv;
@@ -3614,7 +3603,6 @@ typedef AtkObjectFactoryClass CajaIconCanvasItemAccessibleFactoryClass;
G_DEFINE_TYPE (CajaIconCanvasItemAccessibleFactory, caja_icon_canvas_item_accessible_factory,
ATK_TYPE_OBJECT_FACTORY);
-
static AtkObject *
caja_icon_canvas_item_accessible_factory_create_accessible (GObject *for_object)
{
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index d4fe27b4..77626b2d 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -294,7 +294,6 @@ icon_is_positioned (const CajaIcon *icon)
return icon->x != ICON_UNPOSITIONED_VALUE && icon->y != ICON_UNPOSITIONED_VALUE;
}
-
/* x, y are the top-left coordinates of the icon. */
static void
icon_set_position (CajaIcon *icon,
@@ -712,7 +711,6 @@ icon_get_row_and_column_bounds (CajaIconContainer *container,
}
}
-
}
static void
@@ -1411,7 +1409,6 @@ lay_down_icons_horizontal (CajaIconContainer *container,
{
icon_width = ceil ((bounds.x1 - bounds.x0)/grid_width) * grid_width;
-
}
else
{
@@ -1754,7 +1751,6 @@ snap_position (CajaIconContainer *container,
*x = get_mirror_x_position (container, icon, *x);
}
-
/* Find the grid position vertically and place on the proper baseline */
baseline_y = *y + icon_height;
baseline_y = SNAP_NEAREST_VERTICAL (baseline_y);
@@ -2294,7 +2290,6 @@ lay_down_icons_vertical_desktop (CajaIconContainer *container, GList *icons)
caja_icon_container_freeze_icon_positions (container);
}
-
static void
lay_down_icons (CajaIconContainer *container, GList *icons, double start_y)
{
@@ -2544,7 +2539,6 @@ select_range (CajaIconContainer *container,
return selection_changed;
}
-
static gboolean
select_one_unselect_others (CajaIconContainer *container,
CajaIcon *icon_to_select)
@@ -3082,7 +3076,6 @@ get_cmp_point_y (CajaIconContainer *container,
}
}
-
static int
compare_icons_horizontal (CajaIconContainer *container,
CajaIcon *icon_a,
@@ -3626,7 +3619,6 @@ previous_column_highest (CajaIconContainer *container,
return best_so_far == NULL;
}
-
static gboolean
next_column_highest (CajaIconContainer *container,
CajaIcon *start_icon,
@@ -3722,7 +3714,6 @@ closest_in_90_degrees (CajaIconContainer *container,
int dist;
int *best_dist;
-
world_rect = caja_icon_canvas_item_get_icon_rectangle (candidate->item);
eel_canvas_w2c
(EEL_CANVAS (container),
@@ -4805,7 +4796,6 @@ caja_icon_container_did_not_drag (CajaIconContainer *container,
* the selection or pressing for a very long time, or double clicking.
*/
-
if (click_count == 0 &&
event->time - details->button_down_time < MAX_CLICK_TIME &&
! button_event_modifies_selection (event))
@@ -5251,7 +5241,6 @@ caja_icon_container_search_position_func (CajaIconContainer *container,
GdkMonitor *monitor_num;
GdkRectangle monitor;
-
cont_window = gtk_widget_get_window (GTK_WIDGET (container));
scale = gtk_widget_get_scale_factor (GTK_WIDGET (container));
screen = gdk_window_get_screen (cont_window);
@@ -6589,7 +6578,6 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
FALSE,
G_PARAM_READABLE));
-
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set, GDK_KEY_f, GDK_CONTROL_MASK, "start_interactive_search", 0);
@@ -6639,7 +6627,6 @@ handle_scale_factor_changed (GObject *object,
caja_icon_container_request_update_all (CAJA_ICON_CONTAINER (object));
}
-
static int text_ellipsis_limits[CAJA_ZOOM_LEVEL_N_ENTRIES];
static int desktop_text_ellipsis_limit;
@@ -6946,7 +6933,6 @@ handle_icon_button_press (CajaIconContainer *container,
event);
}
-
return TRUE;
}
@@ -7438,7 +7424,6 @@ caja_icon_container_stop_monitor_top_left (CajaIconContainer *container,
klass->stop_monitor_top_left (container, data, client);
}
-
static void
caja_icon_container_prioritize_thumbnailing (CajaIconContainer *container,
CajaIcon *icon)
@@ -7542,7 +7527,6 @@ handle_hadjustment_changed (GtkAdjustment *adjustment,
}
}
-
void
caja_icon_container_update_icon (CajaIconContainer *container,
CajaIcon *icon)
@@ -7584,7 +7568,6 @@ caja_icon_container_update_icon (CajaIconContainer *container,
icon_get_size (container, icon, &icon_size);
}
-
icon_size = MAX (icon_size, min_image_size);
icon_size = MIN (icon_size, max_image_size);
@@ -7599,7 +7582,6 @@ caja_icon_container_update_icon (CajaIconContainer *container,
large_embedded_text, &embedded_text_needs_loading,
&has_open_window);
-
if (container->details->forced_icon_size > 0)
pixbuf = caja_icon_info_get_pixbuf_at_size (icon_info, icon_size);
else
@@ -8141,7 +8123,6 @@ caja_icon_container_invert_selection (CajaIconContainer *container)
g_signal_emit (container, signals[SELECTION_CHANGED], 0);
}
-
/* Returns an array of GdkPoints of locations of the icons. */
static GArray *
caja_icon_container_get_icon_locations (CajaIconContainer *container,
@@ -8649,7 +8630,6 @@ caja_icon_container_set_auto_layout (CajaIconContainer *container,
g_signal_emit (container, signals[LAYOUT_CHANGED], 0);
}
-
/* Toggle the tighter layout boolean. */
void
caja_icon_container_set_tighter_layout (CajaIconContainer *container,
@@ -8967,7 +8947,6 @@ caja_icon_container_start_renaming_selected_item (CajaIconContainer *container,
g_assert (!has_multiple_selection (container));
-
if (!icon_is_positioned (icon))
{
set_pending_icon_to_rename (container, icon);
@@ -9655,7 +9634,6 @@ caja_icon_container_accessible_cleared_cb (CajaIconContainer *container,
g_signal_emit_by_name (data, "children_changed", 0, NULL, NULL);
}
-
static gboolean
caja_icon_container_accessible_add_selection (AtkSelection *accessible,
int i)
@@ -9859,7 +9837,6 @@ caja_icon_container_accessible_selection_interface_init (AtkSelectionIface *ifac
iface->select_all_selection = caja_icon_container_accessible_select_all_selection;
}
-
static gint
caja_icon_container_accessible_get_n_children (AtkObject *accessible)
{
diff --git a/libcaja-private/caja-icon-container.h b/libcaja-private/caja-icon-container.h
index 1e7bbbe7..d78310d5 100644
--- a/libcaja-private/caja-icon-container.h
+++ b/libcaja-private/caja-icon-container.h
@@ -42,7 +42,6 @@
#define CAJA_ICON_CONTAINER_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_ICON_CONTAINER, CajaIconContainerClass))
-
#define CAJA_ICON_CONTAINER_ICON_DATA(pointer) \
((CajaIconData *) (pointer))
@@ -245,7 +244,6 @@ typedef struct
GType caja_icon_container_get_type (void);
GtkWidget * caja_icon_container_new (void);
-
/* adding, removing, and managing icons */
void caja_icon_container_clear (CajaIconContainer *view);
gboolean caja_icon_container_add (CajaIconContainer *view,
@@ -301,7 +299,6 @@ void caja_icon_container_set_highlighted_for_clipboard (CajaIconCon
void caja_icon_container_unselect_all (CajaIconContainer *view);
void caja_icon_container_select_all (CajaIconContainer *view);
-
/* operations on the selection */
GList * caja_icon_container_get_selection (CajaIconContainer *view);
void caja_icon_container_invert_selection (CajaIconContainer *view);
@@ -361,7 +358,6 @@ void caja_icon_container_set_store_layout_timestamps (CajaIconCon
void caja_icon_container_widget_to_file_operation_position (CajaIconContainer *container,
GdkPoint *position);
-
#define CANVAS_WIDTH(container,allocation) ((allocation.width \
- container->details->left_margin \
- container->details->right_margin) \
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index a41271e0..dde633e3 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -25,12 +25,10 @@
Andy Hertzfeld <[email protected]>
Pavel Cisler <[email protected]>
-
XDS support: Benedikt Meurer <[email protected]> (adapted by Amos Brocco <[email protected]>)
*/
-
#include <config.h>
#include <math.h>
#include <stdio.h>
@@ -183,7 +181,6 @@ set_shadow_position (EelCanvasItem *shadow,
NULL);
}
-
/* Source-side handling of the drag. */
/* iteration glue struct */
@@ -339,7 +336,6 @@ drag_data_get_callback (GtkWidget *widget,
info, time, widget, each_icon_get_data_binder);
}
-
/* Target-side handling of the drag. */
static void
@@ -1221,7 +1217,6 @@ selection_is_image_file (GList *selection_list)
return result;
}
-
static void
caja_icon_container_receive_dropped_icons (CajaIconContainer *container,
GdkDragContext *context,
@@ -1943,7 +1938,6 @@ caja_icon_dnd_init (CajaIconContainer *container)
g_return_if_fail (container != NULL);
g_return_if_fail (CAJA_IS_ICON_CONTAINER (container));
-
container->details->dnd_info = g_new0 (CajaIconDndInfo, 1);
caja_drag_init (&container->details->dnd_info->drag_info,
drag_types, G_N_ELEMENTS (drag_types), TRUE);
@@ -1966,7 +1960,6 @@ caja_icon_dnd_init (CajaIconContainer *container)
targets = gtk_drag_dest_get_target_list (GTK_WIDGET (container));
gtk_target_list_add_text_targets (targets, CAJA_ICON_DND_TEXT);
-
/* Messages for outgoing drag. */
g_signal_connect (container, "drag_begin",
G_CALLBACK (drag_begin_callback), NULL);
diff --git a/libcaja-private/caja-icon-dnd.h b/libcaja-private/caja-icon-dnd.h
index 2cea0f1d..ac6f2df5 100644
--- a/libcaja-private/caja-icon-dnd.h
+++ b/libcaja-private/caja-icon-dnd.h
@@ -43,7 +43,6 @@ typedef struct
EelCanvasItem *shadow;
} CajaIconDndInfo;
-
void caja_icon_dnd_init (CajaIconContainer *container);
void caja_icon_dnd_fini (CajaIconContainer *container);
void caja_icon_dnd_begin_drag (CajaIconContainer *container,
diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c
index 3d789bfd..cf690a6e 100644
--- a/libcaja-private/caja-icon-info.c
+++ b/libcaja-private/caja-icon-info.c
@@ -184,7 +184,6 @@ caja_icon_info_new_for_icon_info (GtkIconInfo *icon_info,
return icon;
}
-
typedef struct
{
GIcon *icon;
@@ -378,7 +377,6 @@ caja_icon_info_lookup (GIcon *icon,
pixbuf = gtk_icon_info_load_icon (gtkicon_info, NULL);
}
-
icon_info = caja_icon_info_new_for_pixbuf (pixbuf, scale);
key = icon_key_new (icon, scale, size);
@@ -759,7 +757,6 @@ caja_get_icon_size_for_stock_size (GtkIconSize size)
return CAJA_ZOOM_LEVEL_STANDARD;
}
-
guint
caja_icon_get_emblem_size_for_icon_size (guint size)
{
diff --git a/libcaja-private/caja-icon-info.h b/libcaja-private/caja-icon-info.h
index eb76bec3..7e1f12f4 100644
--- a/libcaja-private/caja-icon-info.h
+++ b/libcaja-private/caja-icon-info.h
@@ -45,7 +45,6 @@ extern "C" {
typedef struct _CajaIconInfo CajaIconInfo;
typedef struct _CajaIconInfoClass CajaIconInfoClass;
-
#define CAJA_TYPE_ICON_INFO (caja_icon_info_get_type ())
#define CAJA_ICON_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_ICON_INFO, CajaIconInfo))
#define CAJA_ICON_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_ICON_INFO, CajaIconInfoClass))
@@ -53,7 +52,6 @@ extern "C" {
#define CAJA_IS_ICON_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAJA_TYPE_ICON_INFO))
#define CAJA_ICON_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_ICON_INFO, CajaIconInfoClass))
-
GType caja_icon_info_get_type (void) G_GNUC_CONST;
CajaIconInfo * caja_icon_info_new_for_pixbuf (GdkPixbuf *pixbuf,
@@ -103,8 +101,6 @@ extern "C" {
gboolean caja_icon_theme_can_render (GThemedIcon *icon);
GIcon * caja_user_special_directory_get_gicon (GUserDirectory directory);
-
-
#ifdef __cplusplus
}
#endif
diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h
index 7efdb9ce..e975d6ec 100644
--- a/libcaja-private/caja-icon-private.h
+++ b/libcaja-private/caja-icon-private.h
@@ -70,7 +70,6 @@ typedef struct
eel_boolean_bit has_lazy_position : 1;
} CajaIcon;
-
/* Private CajaIconContainer members. */
typedef struct
@@ -319,6 +318,4 @@ gboolean caja_icon_container_scroll (CajaIconContainer
int delta_y);
void caja_icon_container_update_scroll_region (CajaIconContainer *container);
-
-
#endif /* CAJA_ICON_CONTAINER_PRIVATE_H */
diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c
index 441e8a11..0047756e 100644
--- a/libcaja-private/caja-keep-last-vertical-box.c
+++ b/libcaja-private/caja-keep-last-vertical-box.c
@@ -49,7 +49,6 @@ caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox *box)
gtk_orientable_set_orientation (GTK_ORIENTABLE (box), GTK_ORIENTATION_VERTICAL);
}
-
/* caja_keep_last_vertical_box_new:
*
* Create a new vertical box that clips off items from the end that don't
diff --git a/libcaja-private/caja-link.c b/libcaja-private/caja-link.c
index d0677731..2ed3d257 100644
--- a/libcaja-private/caja-link.c
+++ b/libcaja-private/caja-link.c
@@ -141,8 +141,6 @@ _g_key_file_save_to_gfile (GKeyFile *key_file,
return TRUE;
}
-
-
static GKeyFile *
_g_key_file_new_from_uri (const char *uri,
GKeyFileFlags flags,
@@ -270,7 +268,6 @@ caja_link_local_create (const char *directory_uri,
image != NULL ? "Icon=" : "",
image != NULL ? image : "");
-
if (!g_file_replace_contents (file,
contents, strlen (contents),
NULL, FALSE,
@@ -355,7 +352,6 @@ caja_link_local_set_key (const char *uri,
g_key_file_set_string (key_file, MAIN_GROUP, key, value);
}
-
success = _g_key_file_save_to_gfile (key_file, file, NULL);
g_key_file_free (key_file);
g_object_unref (file);
@@ -369,7 +365,6 @@ caja_link_local_set_text (const char *uri,
return caja_link_local_set_key (uri, "Name", text, TRUE);
}
-
gboolean
caja_link_local_set_icon (const char *uri,
const char *icon)
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 83ca70b9..252ee60e 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -114,7 +114,6 @@ static void activate_callback (GList *files,
gpointer callback_data);
static void activation_mount_not_mounted (ActivateParameters *parameters);
-
static void
launch_location_free (LaunchLocation *location)
{
@@ -147,7 +146,6 @@ get_file_list_for_launch_locations (GList *locations)
return g_list_reverse (files);
}
-
static LaunchLocation *
launch_location_from_file (CajaFile *file)
{
@@ -285,7 +283,6 @@ filter_non_uri_apps (GList *apps)
return apps;
}
-
static gboolean
caja_mime_actions_check_if_required_attributes_ready (CajaFile *file)
{
@@ -312,7 +309,6 @@ file_has_local_path (CajaFile *file)
char *path;
gboolean res;
-
/* Don't only check _is_native, because we want to support
using the fuse path */
location = caja_file_get_location (file);
@@ -439,7 +435,6 @@ application_compare_by_id (const GAppInfo *app_a,
return 1;
}
-
return strcmp (id_a, id_b);
}
@@ -808,7 +803,6 @@ get_executable_text_file_action (GtkWindow *parent_window, CajaFile *file)
}
-
file_name = caja_file_get_display_name (file);
prompt = g_strdup_printf (_("Do you want to run \"%s\", or display its contents?"),
file_name);
@@ -937,7 +931,6 @@ caja_mime_file_opens_in_external_app (CajaFile *file)
return (activation_action == ACTIVATION_ACTION_OPEN_IN_APPLICATION);
}
-
static unsigned int
mime_application_hash (GAppInfo *app)
{
@@ -967,7 +960,6 @@ list_to_parameters_foreach (GAppInfo *application,
*ret = g_list_prepend (*ret, parameters);
}
-
/**
* make_activation_parameters
*
@@ -1152,7 +1144,6 @@ unpause_activation_timed_cancel (ActivateParameters *parameters)
}
}
-
static void
activate_mount_op_active (GtkMountOperation *operation,
GParamSpec *pspec,
@@ -1942,7 +1933,6 @@ activate_files (ActivateParameters *parameters)
open_in_view_files = g_list_reverse (open_in_view_files);
}
-
for (l = open_in_view_files; l != NULL; l = l->next)
{
GFile *f;
@@ -2116,7 +2106,6 @@ activation_mount_not_mounted (ActivateParameters *parameters)
caja_file_list_free (files);
}
-
static void
activate_callback (GList *files, gpointer callback_data)
{
@@ -2156,7 +2145,6 @@ activate_callback (GList *files, gpointer callback_data)
}
}
-
if (parameters->not_mounted != NULL)
{
activation_mount_not_mounted (parameters);
@@ -2236,7 +2224,6 @@ activate_activation_uris_ready_callback (GList *files_ignore,
g_free (uri);
}
-
/* get the parameters for the actual files */
files = get_file_list_for_launch_locations (parameters->locations);
caja_file_list_call_when_ready
@@ -2305,7 +2292,6 @@ activation_mountable_mounted (CajaFile *file,
parameters->mountables = g_list_remove (parameters->mountables, file);
caja_file_unref (file);
-
if (error == NULL)
{
CajaFile *target_file;
@@ -2360,7 +2346,6 @@ activation_mountable_mounted (CajaFile *file,
activation_mount_mountables (parameters);
}
-
static void
activation_mount_mountables (ActivateParameters *parameters)
{
@@ -2387,7 +2372,6 @@ activation_mount_mountables (ActivateParameters *parameters)
activation_get_activation_uris (parameters);
}
-
static void
activation_mountable_started (CajaFile *file,
GFile *gfile_of_file,
@@ -2538,7 +2522,6 @@ caja_mime_activate_files (GtkWindow *parent_window,
file_count);
}
-
for (l = parameters->locations; l != NULL; l = next)
{
location = l->data;
diff --git a/libcaja-private/caja-mime-actions.h b/libcaja-private/caja-mime-actions.h
index 48c9c1c5..1bc7b2fe 100644
--- a/libcaja-private/caja-mime-actions.h
+++ b/libcaja-private/caja-mime-actions.h
@@ -57,5 +57,4 @@ void caja_mime_activate_file (GtkWindow
CajaWindowOpenMode mode,
CajaWindowOpenFlags flags);
-
#endif /* CAJA_MIME_ACTIONS_H */
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index e842cf27..ab9b8026 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -94,7 +94,6 @@ caja_mime_application_chooser_finalize (GObject *object)
G_CALLBACK (mime_type_data_changed_cb),
chooser);
-
g_free (chooser->details->uri);
g_free (chooser->details->content_type);
g_free (chooser->details->extension);
diff --git a/libcaja-private/caja-module.h b/libcaja-private/caja-module.h
index c02ad17a..6cb9779d 100644
--- a/libcaja-private/caja-module.h
+++ b/libcaja-private/caja-module.h
@@ -34,7 +34,6 @@ extern "C" {
GList *caja_module_get_extensions_for_type (GType type);
void caja_module_extension_list_free (GList *list);
-
/* Add a type to the module interface - allows caja to add its own modules
* without putting them in separate shared libraries */
GObject *caja_module_add_type (GType type);
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index dcffd4c2..6e908e29 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -390,7 +390,6 @@ response_cb (CajaOpenWithDialog *dialog,
}
-
static void
caja_open_with_dialog_class_init (CajaOpenWithDialogClass *class)
{
@@ -610,7 +609,6 @@ caja_open_with_dialog_add_icon_idle (CajaOpenWithDialog *dialog)
return TRUE;
}
-
static gboolean
caja_open_with_search_equal_func (GtkTreeModel *model,
int column,
@@ -688,8 +686,6 @@ caja_open_with_search_equal_func (GtkTreeModel *model,
}
}
-
-
static gboolean
caja_open_with_dialog_add_items_idle (CajaOpenWithDialog *dialog)
{
@@ -884,7 +880,6 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
FALSE, FALSE, 0);
gtk_widget_show (dialog->details->label);
-
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_size_request (scrolled_window, 400, 300);
@@ -923,11 +918,9 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
(GSourceFunc) caja_open_with_dialog_add_items_idle,
dialog, NULL);
-
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0);
gtk_widget_show_all (vbox);
-
expander = gtk_expander_new_with_mnemonic (_("_Use a custom command"));
gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
g_signal_connect_after (expander, "activate", G_CALLBACK (expander_toggled), dialog);
@@ -972,7 +965,6 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
"process-stop",
GTK_RESPONSE_CANCEL);
-
/* Create a custom stock icon */
dialog->details->button = gtk_button_new ();
@@ -999,7 +991,6 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
dialog->details->button, RESPONSE_OPEN);
-
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
RESPONSE_OPEN);
@@ -1151,7 +1142,6 @@ set_uri_and_type (CajaOpenWithDialog *dialog,
g_free (name);
}
-
static GtkWidget *
real_caja_open_with_dialog_new (const char *uri,
const char *mime_type,
diff --git a/libcaja-private/caja-open-with-dialog.h b/libcaja-private/caja-open-with-dialog.h
index 693aec02..7b76c336 100644
--- a/libcaja-private/caja-open-with-dialog.h
+++ b/libcaja-private/caja-open-with-dialog.h
@@ -61,6 +61,4 @@ GtkWidget* caja_add_application_dialog_new (const char *uri,
GtkWidget* caja_add_application_dialog_new_for_multiple_files (const char *extension,
const char *mime_type);
-
-
#endif /* CAJA_OPEN_WITH_DIALOG_H */
diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c
index 3ade6cda..1db11351 100644
--- a/libcaja-private/caja-progress-info.c
+++ b/libcaja-private/caja-progress-info.c
@@ -822,7 +822,6 @@ progress_widget_new (CajaProgressInfo *info)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_spacing (GTK_BOX (vbox), 5);
-
data->widget = vbox;
g_object_set_data_full (G_OBJECT (data->widget),
"data", data,
@@ -1329,7 +1328,6 @@ caja_progress_info_set_status (CajaProgressInfo *info,
G_UNLOCK (progress_info);
}
-
void
caja_progress_info_take_details (CajaProgressInfo *info,
char *details)
diff --git a/libcaja-private/caja-progress-info.h b/libcaja-private/caja-progress-info.h
index 61cdb02a..c713361b 100644
--- a/libcaja-private/caja-progress-info.h
+++ b/libcaja-private/caja-progress-info.h
@@ -82,5 +82,4 @@ void caja_progress_info_set_progress (CajaProgressInfo *info,
double total);
void caja_progress_info_pulse_progress (CajaProgressInfo *info);
-
#endif /* CAJA_PROGRESS_INFO_H */
diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c
index 70782c8e..d0902652 100644
--- a/libcaja-private/caja-query.c
+++ b/libcaja-private/caja-query.c
@@ -86,7 +86,6 @@ caja_query_new (void)
return g_object_new (CAJA_TYPE_QUERY, NULL);
}
-
char *
caja_query_get_text (CajaQuery *query)
{
@@ -216,7 +215,6 @@ decode_home_uri (const char *uri)
return decoded_uri;
}
-
typedef struct
{
CajaQuery *query;
@@ -331,7 +329,6 @@ static GMarkupParser parser =
error_cb
};
-
static CajaQuery *
caja_query_parse_xml (char *xml, gsize xml_len)
{
@@ -353,7 +350,6 @@ caja_query_parse_xml (char *xml, gsize xml_len)
return info.query;
}
-
CajaQuery *
caja_query_load (char *file)
{
@@ -366,7 +362,6 @@ caja_query_load (char *file)
return NULL;
}
-
g_file_get_contents (file, &xml, &xml_len, NULL);
query = caja_query_parse_xml (xml, xml_len);
g_free (xml);
@@ -450,7 +445,6 @@ caja_query_save (CajaQuery *query, char *file)
GError *err = NULL;
gboolean res;
-
res = TRUE;
xml = caja_query_to_xml (query);
g_file_set_contents (file, xml, strlen (xml), &err);
diff --git a/libcaja-private/caja-recent.h b/libcaja-private/caja-recent.h
index d2147237..a993ef0f 100644
--- a/libcaja-private/caja-recent.h
+++ b/libcaja-private/caja-recent.h
@@ -1,5 +1,4 @@
-
#ifndef __CAJA_RECENT_H__
#define __CAJA_RECENT_H__
diff --git a/libcaja-private/caja-saved-search-file.c b/libcaja-private/caja-saved-search-file.c
index c55b29be..732e1cf0 100644
--- a/libcaja-private/caja-saved-search-file.c
+++ b/libcaja-private/caja-saved-search-file.c
@@ -28,7 +28,6 @@
G_DEFINE_TYPE(CajaSavedSearchFile, caja_saved_search_file, CAJA_TYPE_VFS_FILE)
-
static void
caja_saved_search_file_init (CajaSavedSearchFile *search_file)
{
diff --git a/libcaja-private/caja-saved-search-file.h b/libcaja-private/caja-saved-search-file.h
index 42089993..327d88f1 100644
--- a/libcaja-private/caja-saved-search-file.h
+++ b/libcaja-private/caja-saved-search-file.h
@@ -40,7 +40,6 @@
#define CAJA_SAVED_SEARCH_FILE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_SAVED_SEARCH_FILE, CajaSavedSearchFileClass))
-
typedef struct CajaSavedSearchFileDetails CajaSavedSearchFileDetails;
typedef struct
diff --git a/libcaja-private/caja-search-directory-file.c b/libcaja-private/caja-search-directory-file.c
index f455dc01..0984caf6 100644
--- a/libcaja-private/caja-search-directory-file.c
+++ b/libcaja-private/caja-search-directory-file.c
@@ -46,7 +46,6 @@ struct CajaSearchDirectoryFileDetails
G_DEFINE_TYPE(CajaSearchDirectoryFile, caja_search_directory_file, CAJA_TYPE_FILE);
-
static void
search_directory_file_monitor_add (CajaFile *file,
gconstpointer client,
@@ -185,7 +184,6 @@ caja_search_directory_file_update_display_name (CajaSearchDirectoryFile *search_
char *display_name;
gboolean changed;
-
display_name = NULL;
file = CAJA_FILE (search_file);
if (file->details->directory)
diff --git a/libcaja-private/caja-search-directory.c b/libcaja-private/caja-search-directory.c
index 8209e546..4613b564 100644
--- a/libcaja-private/caja-search-directory.c
+++ b/libcaja-private/caja-search-directory.c
@@ -493,7 +493,6 @@ search_cancel_callback (CajaDirectory *directory,
}
}
-
static void
search_engine_hits_added (CajaSearchEngine *engine, GList *hits,
CajaSearchDirectory *search)
@@ -686,7 +685,6 @@ search_get_file_list (CajaDirectory *directory)
return caja_file_list_copy (search->details->files);
}
-
static gboolean
search_is_editable (CajaDirectory *directory)
{
@@ -806,7 +804,6 @@ caja_search_directory_generate_new_uri (void)
return uri;
}
-
void
caja_search_directory_set_query (CajaSearchDirectory *search,
CajaQuery *query)
@@ -901,7 +898,6 @@ caja_search_directory_is_indexed (CajaSearchDirectory *search)
return caja_search_engine_is_indexed (search->details->engine);
}
-
void
caja_search_directory_save_to_file (CajaSearchDirectory *search,
const char *save_file_uri)
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index 542ad95b..60a0be65 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -410,7 +410,6 @@ caja_search_engine_beagle_init (CajaSearchEngineBeagle *engine)
engine->details = g_new0 (CajaSearchEngineBeagleDetails, 1);
}
-
CajaSearchEngine *
caja_search_engine_beagle_new (void)
{
diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c
index cdf7ef91..207baeaa 100644
--- a/libcaja-private/caja-search-engine-simple.c
+++ b/libcaja-private/caja-search-engine-simple.c
@@ -54,7 +54,6 @@ typedef struct
gint64 size;
} SearchThreadData;
-
struct CajaSearchEngineSimpleDetails
{
CajaQuery *query;
@@ -173,7 +172,6 @@ typedef struct
SearchThreadData *thread_data;
} SearchHits;
-
static gboolean
search_thread_add_hits_idle (gpointer user_data)
{
@@ -219,7 +217,6 @@ send_batch (SearchThreadData *data)
G_FILE_ATTRIBUTE_STANDARD_TYPE "," \
G_FILE_ATTRIBUTE_ID_FILE
-
/* Stolen code
* file: glocalfileinfo.c
* function: hex_unescape_string
@@ -620,7 +617,6 @@ next:
g_object_unref (enumerator);
}
-
static gpointer
search_thread_func (gpointer user_data)
{
@@ -749,7 +745,6 @@ caja_search_engine_simple_init (CajaSearchEngineSimple *engine)
engine->details = g_new0 (CajaSearchEngineSimpleDetails, 1);
}
-
CajaSearchEngine *
caja_search_engine_simple_new (void)
{
diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c
index 102ca060..21784230 100644
--- a/libcaja-private/caja-search-engine-tracker.c
+++ b/libcaja-private/caja-search-engine-tracker.c
@@ -38,7 +38,6 @@ typedef enum
TRACKER_0_8 = 1 << 2
} TrackerVersion;
-
/* tracker 0.6 API */
typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data);
@@ -48,7 +47,6 @@ static void (*tracker_disconnect) (TrackerClient *client) = NULL;
static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL;
static int (*tracker_get_version) (TrackerClient *client, GError **error) = NULL;
-
static void (*tracker_search_metadata_by_text_async) (TrackerClient *client,
const char *query,
TrackerArrayReply callback,
@@ -70,7 +68,6 @@ static void (*tracker_search_metadata_by_text_and_mime_and_location_async) (Trac
TrackerArrayReply callback,
gpointer user_data) = NULL;
-
/* tracker 0.8 API */
typedef enum
{
@@ -89,7 +86,6 @@ static guint (*tracker_resources_sparql_query_async) (TrackerClient *c
TrackerReplyGPtrArray callback,
gpointer user_data) = NULL;
-
static struct TrackerDlMapping
{
const char *fn_name;
@@ -110,7 +106,6 @@ static struct TrackerDlMapping
#undef MAP
};
-
static TrackerVersion
open_libtracker (void)
{
@@ -178,7 +173,6 @@ open_libtracker (void)
return version;
}
-
struct CajaSearchEngineTrackerDetails
{
CajaQuery *query;
@@ -220,7 +214,6 @@ finalize (GObject *object)
EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
}
-
/* stolen from tracker sources, tracker.c */
static void
sparql_append_string_literal (GString *sparql,
@@ -237,7 +230,6 @@ sparql_append_string_literal (GString *sparql,
g_free (s);
}
-
static void
search_callback (gpointer results, GError *error, gpointer user_data)
{
@@ -308,7 +300,6 @@ search_callback (gpointer results, GError *error, gpointer user_data)
g_list_free_full (hit_uris, g_free);
}
-
static void
caja_search_engine_tracker_start (CajaSearchEngine *engine)
{
@@ -321,7 +312,6 @@ caja_search_engine_tracker_start (CajaSearchEngine *engine)
tracker = CAJA_SEARCH_ENGINE_TRACKER (engine);
-
if (tracker->details->query_pending)
{
return;
@@ -526,7 +516,6 @@ caja_search_engine_tracker_init (CajaSearchEngineTracker *engine)
engine->details = g_new0 (CajaSearchEngineTrackerDetails, 1);
}
-
CajaSearchEngine *
caja_search_engine_tracker_new (void)
{
diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c
index 20a54190..234575de 100644
--- a/libcaja-private/caja-search-engine.c
+++ b/libcaja-private/caja-search-engine.c
@@ -160,7 +160,6 @@ caja_search_engine_start (CajaSearchEngine *engine)
CAJA_SEARCH_ENGINE_GET_CLASS (engine)->start (engine);
}
-
void
caja_search_engine_stop (CajaSearchEngine *engine)
{
@@ -187,7 +186,6 @@ caja_search_engine_hits_added (CajaSearchEngine *engine, GList *hits)
g_signal_emit (engine, signals[HITS_ADDED], 0, hits);
}
-
void
caja_search_engine_hits_subtracted (CajaSearchEngine *engine, GList *hits)
{
@@ -196,7 +194,6 @@ caja_search_engine_hits_subtracted (CajaSearchEngine *engine, GList *hits)
g_signal_emit (engine, signals[HITS_SUBTRACTED], 0, hits);
}
-
void
caja_search_engine_finished (CajaSearchEngine *engine)
{
diff --git a/libcaja-private/caja-sidebar-provider.c b/libcaja-private/caja-sidebar-provider.c
index eb23f886..263a0334 100644
--- a/libcaja-private/caja-sidebar-provider.c
+++ b/libcaja-private/caja-sidebar-provider.c
@@ -66,7 +66,6 @@ caja_sidebar_provider_create (CajaSidebarProvider *provider,
return (* CAJA_SIDEBAR_PROVIDER_GET_IFACE (provider)->create) (provider, window);
}
-
GList *
caja_list_sidebar_providers (void)
{
diff --git a/libcaja-private/caja-sidebar.c b/libcaja-private/caja-sidebar.c
index 2d2b06cc..60c7710e 100644
--- a/libcaja-private/caja-sidebar.c
+++ b/libcaja-private/caja-sidebar.c
@@ -84,7 +84,6 @@ caja_sidebar_get_type (void)
return type;
}
-
const char *
caja_sidebar_get_sidebar_id (CajaSidebar *sidebar)
{
diff --git a/libcaja-private/caja-sidebar.h b/libcaja-private/caja-sidebar.h
index 7eeacb36..5954c659 100644
--- a/libcaja-private/caja-sidebar.h
+++ b/libcaja-private/caja-sidebar.h
@@ -56,7 +56,6 @@ extern "C" {
void (* is_visible_changed) (CajaSidebar *sidebar,
gboolean is_visible);
-
/* Padding for future expansion */
void (*_reserved1) (void);
void (*_reserved2) (void);
diff --git a/libcaja-private/caja-thumbnails.c b/libcaja-private/caja-thumbnails.c
index 69d4a150..527ef256 100644
--- a/libcaja-private/caja-thumbnails.c
+++ b/libcaja-private/caja-thumbnails.c
@@ -152,7 +152,6 @@ get_thumbnail_factory (void)
return thumbnail_factory;
}
-
/* This function is added as a very low priority idle function to start the
thread to create any needed thumbnails. It is added with a very low priority
so that it doesn't delay showing the directory in the icon/list views.
@@ -258,12 +257,10 @@ caja_thumbnail_prioritize (const char *file_uri)
g_mutex_unlock (&thumbnails_mutex);
}
-
/***************************************************************************
* Thumbnail Thread Functions.
***************************************************************************/
-
/* This is a one-shot idle callback called from the main loop to call
notify_file_changed() for a thumbnail. It frees the uri afterwards.
We do this in an idle callback as I don't think caja_file_changed() is
@@ -411,7 +408,6 @@ caja_create_thumbnail (CajaFile *file)
info->original_file_mtime = file_mtime;
-
#ifdef DEBUG_THUMBNAILS
g_message ("(Main Thread) Locking mutex\n");
#endif
diff --git a/libcaja-private/caja-thumbnails.h b/libcaja-private/caja-thumbnails.h
index 95ffb7fb..5147dc09 100644
--- a/libcaja-private/caja-thumbnails.h
+++ b/libcaja-private/caja-thumbnails.h
@@ -40,5 +40,4 @@ gboolean caja_thumbnail_is_mimetype_limited_by_size
void caja_thumbnail_remove_from_queue (const char *file_uri);
void caja_thumbnail_prioritize (const char *file_uri);
-
#endif /* CAJA_THUMBNAILS_H */
diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c
index 19aaae63..6033c07e 100644
--- a/libcaja-private/caja-tree-view-drag-dest.c
+++ b/libcaja-private/caja-tree-view-drag-dest.c
@@ -96,7 +96,6 @@ static const GtkTargetEntry drag_types [] =
{ CAJA_ICON_DND_RAW_TYPE, 0, CAJA_ICON_DND_RAW }
};
-
static void
gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
{
@@ -516,7 +515,6 @@ drag_motion_callback (GtkWidget *widget,
gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
x, y, &path, &pos);
-
if (!dest->details->have_drag_data)
{
res = get_drag_data (dest, context, time);
@@ -895,7 +893,6 @@ receive_xds (CajaTreeViewDragDest *dest,
return TRUE;
}
-
static gboolean
drag_data_received_callback (GtkWidget *widget,
GdkDragContext *context,
@@ -1272,8 +1269,6 @@ caja_tree_view_drag_dest_class_init (CajaTreeViewDragDestClass *class)
G_TYPE_INT);
}
-
-
CajaTreeViewDragDest *
caja_tree_view_drag_dest_new (GtkTreeView *tree_view)
{
diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c
index 9b184164..afe0bed9 100644
--- a/libcaja-private/caja-ui-utilities.c
+++ b/libcaja-private/caja-ui-utilities.c
@@ -71,7 +71,6 @@ caja_ui_prepare_merge_ui (GtkUIManager *ui_manager,
g_object_unref (*action_group); /* owned by ui manager */
}
-
char *
caja_get_ui_directory (void)
{
diff --git a/libcaja-private/caja-vfs-file.c b/libcaja-private/caja-vfs-file.c
index 1f64d93d..8c614bd6 100644
--- a/libcaja-private/caja-vfs-file.c
+++ b/libcaja-private/caja-vfs-file.c
@@ -431,7 +431,6 @@ vfs_file_mount_callback (GObject *source_object,
}
}
-
static void
vfs_file_mount (CajaFile *file,
GMountOperation *mount_op,
@@ -620,7 +619,6 @@ vfs_file_start_callback (GObject *source_object,
}
}
-
static void
vfs_file_start (CajaFile *file,
GMountOperation *mount_op,
diff --git a/libcaja-private/caja-view-factory.c b/libcaja-private/caja-view-factory.c
index e5e4219f..cc35c232 100644
--- a/libcaja-private/caja-view-factory.c
+++ b/libcaja-private/caja-view-factory.c
@@ -44,7 +44,6 @@ caja_view_factory_lookup (const char *id)
g_return_val_if_fail (id != NULL, NULL);
-
for (l = registered_views; l != NULL; l = l->next)
{
view_info = l->data;
@@ -130,4 +129,3 @@ caja_view_factory_get_views_for_uri (const char *uri,
return g_list_reverse (res);
}
-
diff --git a/libcaja-private/caja-view-factory.h b/libcaja-private/caja-view-factory.h
index 65d9124c..765adafd 100644
--- a/libcaja-private/caja-view-factory.h
+++ b/libcaja-private/caja-view-factory.h
@@ -54,7 +54,6 @@ extern "C" {
const char *mime_type);
};
-
void caja_view_factory_register (CajaViewInfo *view_info);
const CajaViewInfo *caja_view_factory_lookup (const char *id);
CajaView * caja_view_factory_create (const char *id,
@@ -67,9 +66,6 @@ extern "C" {
GFileType file_type,
const char *mime_type);
-
-
-
#ifdef __cplusplus
}
#endif
diff --git a/libcaja-private/caja-view.c b/libcaja-private/caja-view.c
index a3c55421..010b361b 100644
--- a/libcaja-private/caja-view.c
+++ b/libcaja-private/caja-view.c
@@ -203,7 +203,6 @@ caja_view_get_title (CajaView *view)
}
}
-
gboolean
caja_view_supports_zooming (CajaView *view)
{
@@ -327,4 +326,3 @@ caja_view_drop_proxy_received_netscape_url (CajaView *view,
}
}
-
diff --git a/libcaja-private/caja-view.h b/libcaja-private/caja-view.h
index 93fafdab..b287170e 100644
--- a/libcaja-private/caja-view.h
+++ b/libcaja-private/caja-view.h
@@ -40,7 +40,6 @@ extern "C" {
#define CAJA_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAJA_TYPE_VIEW))
#define CAJA_VIEW_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CAJA_TYPE_VIEW, CajaViewIface))
-
typedef struct _CajaView CajaView; /* dummy typedef */
typedef struct _CajaViewIface CajaViewIface;
@@ -97,7 +96,6 @@ extern "C" {
have this function return NULL, or just don't supply a function */
char * (* get_title) (CajaView *view);
-
/* Zoom support */
gboolean (* supports_zooming) (CajaView *view);
void (* bump_zoom_level) (CajaView *view,
diff --git a/libcaja-private/caja-window-info.h b/libcaja-private/caja-window-info.h
index 00286e40..eefeb1a4 100644
--- a/libcaja-private/caja-window-info.h
+++ b/libcaja-private/caja-window-info.h
@@ -91,7 +91,6 @@ extern "C" {
typedef struct CajaWindowSlot CajaWindowSlot;
#endif
-
typedef CajaWindowSlot CajaWindowSlotInfo;
typedef CajaWindow CajaWindowInfo;
diff --git a/libcaja-private/caja-window-slot-info.h b/libcaja-private/caja-window-slot-info.h
index 49804820..e9fada53 100644
--- a/libcaja-private/caja-window-slot-info.h
+++ b/libcaja-private/caja-window-slot-info.h
@@ -28,7 +28,6 @@
#include "caja-window-info.h"
#include "caja-view.h"
-
#define CAJA_TYPE_WINDOW_SLOT_INFO (caja_window_slot_info_get_type ())
#define CAJA_WINDOW_SLOT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_WINDOW_SLOT_INFO, CajaWindowSlotInfo))
#define CAJA_IS_WINDOW_SLOT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAJA_TYPE_WINDOW_SLOT_INFO))
@@ -78,7 +77,6 @@ struct _CajaWindowSlotInfoIface
void (* make_hosting_pane_active) (CajaWindowSlotInfo *slot);
};
-
GType caja_window_slot_info_get_type (void);
CajaWindowInfo * caja_window_slot_info_get_window (CajaWindowSlotInfo *slot);
#define caja_window_slot_info_open_location(slot, location, mode, flags, selection) \