[gedit] file-browser: coding style cleanup
- From: Sébastien Lafargue <slafargue src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] file-browser: coding style cleanup
- Date: Sat, 24 Nov 2018 17:59:55 +0000 (UTC)
commit bd5e5fc703638e82764f7fa7755c12aa34b9b0d0
Author: Sebastien Lafargue <slafargue gnome org>
Date: Sat Nov 24 12:36:36 2018 +0100
file-browser: coding style cleanup
plugins/filebrowser/gedit-file-bookmarks-store.c | 123 ++--
plugins/filebrowser/gedit-file-bookmarks-store.h | 2 +-
plugins/filebrowser/gedit-file-browser-store.c | 593 ++++++------------
plugins/filebrowser/gedit-file-browser-store.h | 147 ++---
plugins/filebrowser/gedit-file-browser-view.c | 249 +++-----
plugins/filebrowser/gedit-file-browser-view.h | 2 +-
plugins/filebrowser/gedit-file-browser-widget.c | 728 ++++++++---------------
7 files changed, 635 insertions(+), 1209 deletions(-)
---
diff --git a/plugins/filebrowser/gedit-file-bookmarks-store.c
b/plugins/filebrowser/gedit-file-bookmarks-store.c
index fdfac482c..6bd8b44c6 100644
--- a/plugins/filebrowser/gedit-file-bookmarks-store.c
+++ b/plugins/filebrowser/gedit-file-bookmarks-store.c
@@ -29,7 +29,7 @@
struct _GeditFileBookmarksStorePrivate
{
GVolumeMonitor *volume_monitor;
- GFileMonitor *bookmarks_monitor;
+ GFileMonitor *bookmarks_monitor;
};
static void remove_node (GtkTreeModel *model,
@@ -127,11 +127,9 @@ add_file (GeditFileBookmarksStore *model,
GtkTreeIter *iter)
{
GdkPixbuf *pixbuf = NULL;
- gboolean native;
+ gboolean native = g_file_is_native (file);
gchar *newname;
- native = g_file_is_native (file);
-
if (native && !g_file_query_exists (file, NULL))
return FALSE;
@@ -172,17 +170,14 @@ check_mount_separator (GeditFileBookmarksStore *model,
gboolean added)
{
GtkTreeIter iter;
- gboolean found;
-
- found =
- find_with_flags (GTK_TREE_MODEL (model), &iter, NULL,
- flags | GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR,
- 0);
+ gboolean found = find_with_flags (GTK_TREE_MODEL (model), &iter, NULL,
+ flags | GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR,
+ 0);
if (added && !found)
{
/* Add the separator */
- add_node (model, NULL, NULL, NULL,
+ add_node (model, NULL, NULL, NULL, NULL,
flags | GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR,
NULL);
}
@@ -195,15 +190,17 @@ check_mount_separator (GeditFileBookmarksStore *model,
static void
init_special_directories (GeditFileBookmarksStore *model)
{
- gchar const *path;
+ gchar const *path = g_get_home_dir ();
GFile *file;
- path = g_get_home_dir ();
if (path != NULL)
{
file = g_file_new_for_path (path);
- add_file (model, file, _("Home"), GEDIT_FILE_BOOKMARKS_STORE_IS_HOME |
- GEDIT_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR, NULL);
+ add_file (model,
+ file,
+ _("Home"),
+ GEDIT_FILE_BOOKMARKS_STORE_IS_HOME | GEDIT_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR,
+ NULL);
g_object_unref (file);
}
@@ -212,8 +209,11 @@ init_special_directories (GeditFileBookmarksStore *model)
if (path != NULL)
{
file = g_file_new_for_path (path);
- add_file (model, file, NULL, GEDIT_FILE_BOOKMARKS_STORE_IS_DESKTOP |
- GEDIT_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR, NULL);
+ add_file (model,
+ file,
+ NULL,
+ GEDIT_FILE_BOOKMARKS_STORE_IS_DESKTOP | GEDIT_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR,
+ NULL);
g_object_unref (file);
}
@@ -221,8 +221,11 @@ init_special_directories (GeditFileBookmarksStore *model)
if (path != NULL)
{
file = g_file_new_for_path (path);
- add_file (model, file, NULL, GEDIT_FILE_BOOKMARKS_STORE_IS_DOCUMENTS |
- GEDIT_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR, NULL);
+ add_file (model,
+ file,
+ NULL,
+ GEDIT_FILE_BOOKMARKS_STORE_IS_DOCUMENTS | GEDIT_FILE_BOOKMARKS_STORE_IS_SPECIAL_DIR,
+ NULL);
g_object_unref (file);
}
#endif
@@ -300,9 +303,8 @@ static void
process_volume_cb (GVolume *volume,
GeditFileBookmarksStore *model)
{
- GMount *mount;
+ GMount *mount = g_volume_get_mount (volume);
guint flags = GEDIT_FILE_BOOKMARKS_STORE_NONE;
- mount = g_volume_get_mount (volume);
/* CHECK: should we use the LOCAL/REMOTE thing still? */
if (mount)
@@ -339,9 +341,7 @@ static void
process_drive_cb (GDrive *drive,
GeditFileBookmarksStore *model)
{
- GList *volumes;
-
- volumes = g_drive_get_volumes (drive);
+ GList *volumes = g_drive_get_volumes (drive);
if (volumes)
{
@@ -358,9 +358,7 @@ process_drive_cb (GDrive *drive,
static void
init_drives (GeditFileBookmarksStore *model)
{
- GList *drives;
-
- drives = g_volume_monitor_get_connected_drives (model->priv->volume_monitor);
+ GList *drives = g_volume_monitor_get_connected_drives (model->priv->volume_monitor);
g_list_foreach (drives, (GFunc)process_drive_cb, model);
g_list_free_full (drives, g_object_unref);
@@ -370,9 +368,7 @@ static void
process_volume_nodrive_cb (GVolume *volume,
GeditFileBookmarksStore *model)
{
- GDrive *drive;
-
- drive = g_volume_get_drive (volume);
+ GDrive *drive = g_volume_get_drive (volume);
if (drive)
{
@@ -386,9 +382,7 @@ process_volume_nodrive_cb (GVolume *volume,
static void
init_volumes (GeditFileBookmarksStore *model)
{
- GList *volumes;
-
- volumes = g_volume_monitor_get_volumes (model->priv->volume_monitor);
+ GList *volumes = g_volume_monitor_get_volumes (model->priv->volume_monitor);
g_list_foreach (volumes, (GFunc)process_volume_nodrive_cb, model);
g_list_free_full (volumes, g_object_unref);
@@ -398,9 +392,7 @@ static void
process_mount_novolume_cb (GMount *mount,
GeditFileBookmarksStore *model)
{
- GVolume *volume;
-
- volume = g_mount_get_volume (mount);
+ GVolume *volume = g_mount_get_volume (mount);
if (volume)
{
@@ -416,9 +408,7 @@ process_mount_novolume_cb (GMount *mount,
static void
init_mounts (GeditFileBookmarksStore *model)
{
- GList *mounts;
-
- mounts = g_volume_monitor_get_mounts (model->priv->volume_monitor);
+ GList *mounts = g_volume_monitor_get_mounts (model->priv->volume_monitor);
g_list_foreach (mounts, (GFunc)process_mount_novolume_cb, model);
g_list_free_full (mounts, g_object_unref);
@@ -463,12 +453,10 @@ add_bookmark (GeditFileBookmarksStore *model,
gchar const *name,
gchar const *uri)
{
- GFile *file;
- gboolean ret;
+ GFile *file = g_file_new_for_uri (uri);
guint flags = GEDIT_FILE_BOOKMARKS_STORE_IS_BOOKMARK;
GtkTreeIter iter;
-
- file = g_file_new_for_uri (uri);
+ gboolean ret;
if (g_file_is_native (file))
flags |= GEDIT_FILE_BOOKMARKS_STORE_IS_LOCAL_BOOKMARK;
@@ -478,7 +466,6 @@ add_bookmark (GeditFileBookmarksStore *model,
ret = add_file (model, file, name, flags, &iter);
g_object_unref (file);
-
return ret;
}
@@ -553,9 +540,8 @@ parse_bookmarks_file (GeditFileBookmarksStore *model,
/* Add a watch */
if (model->priv->bookmarks_monitor == NULL)
{
- GFile *file;
+ GFile *file = g_file_new_for_path (bookmarks);
- file = g_file_new_for_path (bookmarks);
model->priv->bookmarks_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL);
g_object_unref (file);
@@ -571,11 +557,9 @@ parse_bookmarks_file (GeditFileBookmarksStore *model,
static void
init_bookmarks (GeditFileBookmarksStore *model)
{
- gchar *bookmarks;
+ gchar *bookmarks = get_bookmarks_file ();
gboolean added = FALSE;
- bookmarks = get_bookmarks_file ();
-
if (!parse_bookmarks_file (model, bookmarks, &added))
{
g_free (bookmarks);
@@ -588,9 +572,9 @@ init_bookmarks (GeditFileBookmarksStore *model)
if (added)
{
/* Bookmarks separator */
- add_node (model, NULL, NULL, NULL,
- GEDIT_FILE_BOOKMARKS_STORE_IS_BOOKMARK |
- GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR, NULL);
+ add_node (model, NULL, NULL, NULL, NULL,
+ GEDIT_FILE_BOOKMARKS_STORE_IS_BOOKMARK | GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR,
+ NULL);
}
g_free (bookmarks);
@@ -678,12 +662,10 @@ bookmarks_compare_flags (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b)
{
+ guint sep = GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR;
guint f1;
guint f2;
gint *flags;
- guint sep;
-
- sep = GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR;
gtk_tree_model_get (model, a,
GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &f1,
@@ -719,9 +701,7 @@ bookmarks_compare_func (GtkTreeModel *model,
GtkTreeIter *b,
gpointer user_data)
{
- gint result;
-
- result = bookmarks_compare_flags (model, a, b);
+ gint result = bookmarks_compare_flags (model, a, b);
if (result == 0)
result = bookmarks_compare_names (model, a, b);
@@ -746,11 +726,11 @@ find_with_flags (GtkTreeModel *model,
do
{
- gtk_tree_model_get (model, &child,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT,
- &childobj,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS,
- &childflags, -1);
+ gtk_tree_model_get (model,
+ &child,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT, &childobj,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &childflags,
+ -1);
fequal = (obj == childobj);
@@ -771,11 +751,13 @@ find_with_flags (GtkTreeModel *model,
}
static void
-remove_node (GtkTreeModel *model, GtkTreeIter *iter)
+remove_node (GtkTreeModel *model,
+ GtkTreeIter *iter)
{
guint flags;
- gtk_tree_model_get (model, iter,
+ gtk_tree_model_get (model,
+ iter,
GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &flags,
-1);
@@ -853,11 +835,10 @@ gedit_file_bookmarks_store_get_location (GeditFileBookmarksStore *model,
g_return_val_if_fail (GEDIT_IS_FILE_BOOKMARKS_STORE (model), NULL);
g_return_val_if_fail (iter != NULL, NULL);
- gtk_tree_model_get (GTK_TREE_MODEL (model), iter,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS,
- &flags,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT,
- &obj,
+ gtk_tree_model_get (GTK_TREE_MODEL (model),
+ iter,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &flags,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT, &obj,
-1);
if (obj == NULL)
@@ -868,7 +849,7 @@ gedit_file_bookmarks_store_get_location (GeditFileBookmarksStore *model,
if (isfs && (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_MOUNT))
file = g_mount_get_root (G_MOUNT (obj));
else if (!isfs)
- file = g_object_ref (obj);
+ file = (GFile *)g_object_ref (obj);
g_object_unref (obj);
diff --git a/plugins/filebrowser/gedit-file-bookmarks-store.h
b/plugins/filebrowser/gedit-file-bookmarks-store.h
index 8ac91b1a4..ac47a79a5 100644
--- a/plugins/filebrowser/gedit-file-bookmarks-store.h
+++ b/plugins/filebrowser/gedit-file-bookmarks-store.h
@@ -65,7 +65,7 @@ enum
struct _GeditFileBookmarksStore
{
- GtkTreeStore parent;
+ GtkTreeStore parent;
GeditFileBookmarksStorePrivate *priv;
};
diff --git a/plugins/filebrowser/gedit-file-browser-store.c b/plugins/filebrowser/gedit-file-browser-store.c
index 08baeb593..497578b47 100644
--- a/plugins/filebrowser/gedit-file-browser-store.c
+++ b/plugins/filebrowser/gedit-file-browser-store.c
@@ -60,69 +60,69 @@ typedef gint (*SortFunc) (FileBrowserNode *node1,
struct _AsyncData
{
GeditFileBrowserStore *model;
- GCancellable *cancellable;
- gboolean trash;
- GList *files;
- GList *iter;
- gboolean removed;
+ GCancellable *cancellable;
+ gboolean trash;
+ GList *files;
+ GList *iter;
+ gboolean removed;
};
struct _AsyncNode
{
FileBrowserNodeDir *dir;
- GCancellable *cancellable;
- GSList *original_children;
+ GCancellable *cancellable;
+ GSList *original_children;
};
typedef struct {
GeditFileBrowserStore *model;
- GFile *virtual_root;
- GMountOperation *operation;
- GCancellable *cancellable;
+ GFile *virtual_root;
+ GMountOperation *operation;
+ GCancellable *cancellable;
} MountInfo;
struct _FileBrowserNode
{
- GFile *file;
- guint flags;
- gchar *name;
- gchar *markup;
+ GFile *file;
+ guint flags;
+ gchar *name;
+ gchar *markup;
- GdkPixbuf *icon;
- GdkPixbuf *emblem;
+ GdkPixbuf *icon;
+ GdkPixbuf *emblem;
FileBrowserNode *parent;
- gint pos;
- gboolean inserted;
+ gint pos;
+ gboolean inserted;
};
struct _FileBrowserNodeDir
{
- FileBrowserNode node;
- GSList *children;
+ FileBrowserNode node;
+ GSList *children;
- GCancellable *cancellable;
- GFileMonitor *monitor;
+ GCancellable *cancellable;
+ GFileMonitor *monitor;
GeditFileBrowserStore *model;
};
struct _GeditFileBrowserStorePrivate
{
- FileBrowserNode *root;
- FileBrowserNode *virtual_root;
- GType column_types[GEDIT_FILE_BROWSER_STORE_COLUMN_NUM];
+ FileBrowserNode *root;
+ FileBrowserNode *virtual_root;
+ GType column_types[GEDIT_FILE_BROWSER_STORE_COLUMN_NUM];
- GeditFileBrowserStoreFilterMode filter_mode;
- GeditFileBrowserStoreFilterFunc filter_func;
- gpointer filter_user_data;
+ GeditFileBrowserStoreFilterMode filter_mode;
+ GeditFileBrowserStoreFilterFunc filter_func;
+ gpointer filter_user_data;
- gchar **binary_patterns;
- GPtrArray *binary_pattern_specs;
+ gchar **binary_patterns;
+ GPtrArray *binary_pattern_specs;
- SortFunc sort_func;
+ SortFunc sort_func;
- GSList *async_handles;
- MountInfo *mount_info;
+ GSList *async_handles;
+ MountInfo *mount_info;
};
static FileBrowserNode *model_find_node (GeditFileBrowserStore *model,
@@ -246,7 +246,6 @@ static void
gedit_file_browser_store_finalize (GObject *object)
{
GeditFileBrowserStore *obj = GEDIT_FILE_BROWSER_STORE (object);
- GSList *item;
/* Free all the nodes */
file_browser_node_free (obj, obj->priv->root);
@@ -258,9 +257,9 @@ gedit_file_browser_store_finalize (GObject *object)
}
/* Cancel any asynchronous operations */
- for (item = obj->priv->async_handles; item; item = item->next)
+ for (GSList *item = obj->priv->async_handles; item; item = item->next)
{
- AsyncData *data = (AsyncData *) (item->data);
+ AsyncData *data = (AsyncData *)(item->data);
g_cancellable_cancel (data->cancellable);
data->removed = TRUE;
@@ -277,13 +276,9 @@ set_gvalue_from_node (GValue *value,
FileBrowserNode *node)
{
if (node == NULL)
- {
g_value_set_object (value, NULL);
- }
else
- {
g_value_set_object (value, node->file);
- }
}
static void
@@ -328,12 +323,10 @@ gedit_file_browser_store_set_property (GObject *object,
gedit_file_browser_store_set_root (obj, G_FILE (g_value_get_object (value)));
break;
case PROP_FILTER_MODE:
- gedit_file_browser_store_set_filter_mode (obj,
- g_value_get_flags (value));
+ gedit_file_browser_store_set_filter_mode (obj, g_value_get_flags (value));
break;
case PROP_BINARY_PATTERNS:
- gedit_file_browser_store_set_binary_patterns (obj,
- g_value_get_boxed (value));
+ gedit_file_browser_store_set_binary_patterns (obj, g_value_get_boxed (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -347,7 +340,6 @@ gedit_file_browser_store_class_init (GeditFileBrowserStoreClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gedit_file_browser_store_finalize;
-
object_class->get_property = gedit_file_browser_store_get_property;
object_class->set_property = gedit_file_browser_store_set_property;
@@ -533,7 +525,7 @@ model_node_visibility (GeditFileBrowserStore *model,
static gboolean
model_node_inserted (GeditFileBrowserStore *model,
- FileBrowserNode *node)
+ FileBrowserNode *node)
{
return node == model->priv->virtual_root ||
(model_node_visibility (model, node) && node->inserted);
@@ -544,8 +536,7 @@ model_node_inserted (GeditFileBrowserStore *model,
static GtkTreeModelFlags
gedit_file_browser_store_get_flags (GtkTreeModel *tree_model)
{
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model),
- (GtkTreeModelFlags) 0);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), (GtkTreeModelFlags) 0);
return GTK_TREE_MODEL_ITERS_PERSIST;
}
@@ -562,10 +553,8 @@ static GType
gedit_file_browser_store_get_column_type (GtkTreeModel *tree_model,
gint idx)
{
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model),
- G_TYPE_INVALID);
- g_return_val_if_fail (idx < GEDIT_FILE_BROWSER_STORE_COLUMN_NUM &&
- idx >= 0, G_TYPE_INVALID);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), G_TYPE_INVALID);
+ g_return_val_if_fail (idx < GEDIT_FILE_BROWSER_STORE_COLUMN_NUM && idx >= 0, G_TYPE_INVALID);
return GEDIT_FILE_BROWSER_STORE (tree_model)->priv->column_types[idx];
}
@@ -575,9 +564,9 @@ gedit_file_browser_store_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreePath *path)
{
- gint *indices, depth, i;
- FileBrowserNode *node;
GeditFileBrowserStore *model;
+ FileBrowserNode *node;
+ gint *indices, depth;
g_assert (GEDIT_IS_FILE_BROWSER_STORE (tree_model));
g_assert (path != NULL);
@@ -587,7 +576,7 @@ gedit_file_browser_store_get_iter (GtkTreeModel *tree_model,
depth = gtk_tree_path_get_depth (path);
node = model->priv->virtual_root;
- for (i = 0; i < depth; ++i)
+ for (guint i = 0; i < depth; ++i)
{
GSList *item;
gint num = 0;
@@ -600,25 +589,21 @@ gedit_file_browser_store_get_iter (GtkTreeModel *tree_model,
for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
{
- FileBrowserNode *child = (FileBrowserNode *) (item->data);
+ FileBrowserNode *child = (FileBrowserNode *)(item->data);
if (model_node_inserted (model, child))
{
if (num == indices[i])
- {
break;
- }
num++;
}
}
if (item == NULL)
- {
return FALSE;
- }
- node = (FileBrowserNode *) (item->data);
+ node = (FileBrowserNode *)(item->data);
}
iter->user_data = node;
@@ -632,34 +617,28 @@ static GtkTreePath *
gedit_file_browser_store_get_path_real (GeditFileBrowserStore *model,
FileBrowserNode *node)
{
- GtkTreePath *path;
+ GtkTreePath *path = gtk_tree_path_new ();
gint num = 0;
- path = gtk_tree_path_new ();
-
while (node != model->priv->virtual_root)
{
- GSList *item;
-
- if (node->parent == NULL) {
+ if (node->parent == NULL)
+ {
gtk_tree_path_free (path);
return NULL;
}
num = 0;
- for (item = FILE_BROWSER_NODE_DIR (node->parent)->children; item; item = item->next)
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node->parent)->children; item; item = item->next)
{
- FileBrowserNode *check;
-
- check = (FileBrowserNode *) (item->data);
+ FileBrowserNode *check = (FileBrowserNode *)(item->data);
if (model_node_visibility (model, check) && (check == node || check->inserted))
{
if (check == node)
{
- gtk_tree_path_prepend_index (path,
- num);
+ gtk_tree_path_prepend_index (path, num);
break;
}
@@ -690,7 +669,7 @@ gedit_file_browser_store_get_path (GtkTreeModel *tree_model,
g_return_val_if_fail (iter->user_data != NULL, NULL);
return gedit_file_browser_store_get_path_real (GEDIT_FILE_BROWSER_STORE (tree_model),
- (FileBrowserNode *) (iter->user_data));
+ (FileBrowserNode *)(iter->user_data));
}
static void
@@ -705,7 +684,7 @@ gedit_file_browser_store_get_value (GtkTreeModel *tree_model,
g_return_if_fail (iter != NULL);
g_return_if_fail (iter->user_data != NULL);
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
g_value_init (value, GEDIT_FILE_BROWSER_STORE (tree_model)->priv->column_types[column]);
@@ -740,25 +719,23 @@ gedit_file_browser_store_iter_next (GtkTreeModel *tree_model,
{
GeditFileBrowserStore *model;
FileBrowserNode *node;
- GSList *item;
GSList *first;
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model),
- FALSE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
model = GEDIT_FILE_BROWSER_STORE (tree_model);
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
if (node->parent == NULL)
return FALSE;
first = g_slist_next (g_slist_find (FILE_BROWSER_NODE_DIR (node->parent)->children, node));
- for (item = first; item; item = item->next)
+ for (GSList *item = first; item; item = item->next)
{
- if (model_node_inserted (model, (FileBrowserNode *) (item->data)))
+ if (model_node_inserted (model, (FileBrowserNode *)(item->data)))
{
iter->user_data = item->data;
return TRUE;
@@ -775,7 +752,6 @@ gedit_file_browser_store_iter_children (GtkTreeModel *tree_model,
{
FileBrowserNode *node;
GeditFileBrowserStore *model;
- GSList *item;
g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), FALSE);
g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
@@ -785,7 +761,7 @@ gedit_file_browser_store_iter_children (GtkTreeModel *tree_model,
if (parent == NULL)
node = model->priv->virtual_root;
else
- node = (FileBrowserNode *) (parent->user_data);
+ node = (FileBrowserNode *)(parent->user_data);
if (node == NULL)
return FALSE;
@@ -793,9 +769,9 @@ gedit_file_browser_store_iter_children (GtkTreeModel *tree_model,
if (!NODE_IS_DIR (node))
return FALSE;
- for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
{
- if (model_node_inserted (model, (FileBrowserNode *) (item->data)))
+ if (model_node_inserted (model, (FileBrowserNode *)(item->data)))
{
iter->user_data = item->data;
return TRUE;
@@ -809,14 +785,12 @@ static gboolean
filter_tree_model_iter_has_child_real (GeditFileBrowserStore *model,
FileBrowserNode *node)
{
- GSList *item;
-
if (!NODE_IS_DIR (node))
return FALSE;
- for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
{
- if (model_node_inserted (model, (FileBrowserNode *) (item->data)))
+ if (model_node_inserted (model, (FileBrowserNode *)(item->data)))
return TRUE;
}
@@ -830,17 +804,15 @@ gedit_file_browser_store_iter_has_child (GtkTreeModel *tree_model,
FileBrowserNode *node;
GeditFileBrowserStore *model;
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model),
- FALSE);
- g_return_val_if_fail (iter == NULL
- || iter->user_data != NULL, FALSE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), FALSE);
+ g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE);
model = GEDIT_FILE_BROWSER_STORE (tree_model);
if (iter == NULL)
node = model->priv->virtual_root;
else
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
return filter_tree_model_iter_has_child_real (model, node);
}
@@ -851,27 +823,24 @@ gedit_file_browser_store_iter_n_children (GtkTreeModel *tree_model,
{
FileBrowserNode *node;
GeditFileBrowserStore *model;
- GSList *item;
gint num = 0;
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model),
- FALSE);
- g_return_val_if_fail (iter == NULL
- || iter->user_data != NULL, FALSE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), FALSE);
+ g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE);
model = GEDIT_FILE_BROWSER_STORE (tree_model);
if (iter == NULL)
node = model->priv->virtual_root;
else
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
if (!NODE_IS_DIR (node))
return 0;
- for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
{
- if (model_node_inserted (model, (FileBrowserNode *) (item->data)))
+ if (model_node_inserted (model, (FileBrowserNode *)(item->data)))
++num;
}
@@ -886,7 +855,6 @@ gedit_file_browser_store_iter_nth_child (GtkTreeModel *tree_model,
{
FileBrowserNode *node;
GeditFileBrowserStore *model;
- GSList *item;
gint num = 0;
g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_model), FALSE);
@@ -897,14 +865,14 @@ gedit_file_browser_store_iter_nth_child (GtkTreeModel *tree_model,
if (parent == NULL)
node = model->priv->virtual_root;
else
- node = (FileBrowserNode *) (parent->user_data);
+ node = (FileBrowserNode *)(parent->user_data);
if (!NODE_IS_DIR (node))
return FALSE;
- for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
{
- if (model_node_inserted (model, (FileBrowserNode *) (item->data)))
+ if (model_node_inserted (model, (FileBrowserNode *)(item->data)))
{
if (num == n)
{
@@ -931,7 +899,7 @@ gedit_file_browser_store_iter_parent (GtkTreeModel *tree_model,
g_return_val_if_fail (child != NULL, FALSE);
g_return_val_if_fail (child->user_data != NULL, FALSE);
- node = (FileBrowserNode *) (child->user_data);
+ node = (FileBrowserNode *)(child->user_data);
model = GEDIT_FILE_BROWSER_STORE (tree_model);
if (!node_in_tree (model, node))
@@ -961,11 +929,8 @@ gedit_file_browser_store_row_draggable (GtkTreeDragSource *drag_source,
GtkTreeIter iter;
GeditFileBrowserStoreFlag flags;
- if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source),
- &iter, path))
- {
+ if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source), &iter, path))
return FALSE;
- }
gtk_tree_model_get (GTK_TREE_MODEL (drag_source), &iter,
GEDIT_FILE_BROWSER_STORE_COLUMN_FLAGS, &flags,
@@ -991,11 +956,8 @@ gedit_file_browser_store_drag_data_get (GtkTreeDragSource *drag_source,
gchar *uris[2] = {0, };
gboolean ret;
- if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source),
- &iter, path))
- {
+ if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source), &iter, path))
return FALSE;
- }
gtk_tree_model_get (GTK_TREE_MODEL (drag_source), &iter,
GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION, &location,
@@ -1060,21 +1022,14 @@ model_node_update_visibility (GeditFileBrowserStore *model,
}
else if (model->priv->binary_patterns != NULL)
{
- gint i;
- gssize name_length;
- gchar *name_reversed;
+ gssize name_length = strlen (node->name);
+ gchar *name_reversed = g_utf8_strreverse (node->name, name_length);
- name_length = strlen (node->name);
- name_reversed = g_utf8_strreverse (node->name, name_length);
-
- for (i = 0; i < model->priv->binary_pattern_specs->len; ++i)
+ for (guint i = 0; i < model->priv->binary_pattern_specs->len; ++i)
{
- GPatternSpec *spec;
-
- spec = g_ptr_array_index (model->priv->binary_pattern_specs, i);
+ GPatternSpec *spec = g_ptr_array_index (model->priv->binary_pattern_specs, i);
- if (g_pattern_match (spec, name_length,
- node->name, name_reversed))
+ if (g_pattern_match (spec, name_length, node->name, name_reversed))
{
node->flags |= GEDIT_FILE_BROWSER_STORE_FLAG_IS_FILTERED;
g_free (name_reversed);
@@ -1090,11 +1045,8 @@ model_node_update_visibility (GeditFileBrowserStore *model,
{
iter.user_data = node;
- if (!model->priv->filter_func (model, &iter,
- model->priv->filter_user_data))
- {
+ if (!model->priv->filter_func (model, &iter, model->priv->filter_user_data))
node->flags |= GEDIT_FILE_BROWSER_STORE_FLAG_IS_FILTERED;
- }
}
}
@@ -1112,13 +1064,9 @@ collate_nodes (FileBrowserNode *node1,
}
else
{
- gchar *k1, *k2;
- gint result;
-
- k1 = g_utf8_collate_key_for_filename (node1->name, -1);
- k2 = g_utf8_collate_key_for_filename (node2->name, -1);
-
- result = strcmp (k1, k2);
+ gchar *k1 = g_utf8_collate_key_for_filename (node1->name, -1);
+ gchar *k2 = g_utf8_collate_key_for_filename (node2->name, -1);
+ gint result = strcmp (k1, k2);
g_free (k1);
g_free (k2);
@@ -1131,11 +1079,8 @@ static gint
model_sort_default (FileBrowserNode *node1,
FileBrowserNode *node2)
{
- gint f1;
- gint f2;
-
- f1 = NODE_IS_DUMMY (node1);
- f2 = NODE_IS_DUMMY (node2);
+ gint f1 = NODE_IS_DUMMY (node1);
+ gint f2 = NODE_IS_DUMMY (node2);
if (f1 && f2)
return 0;
@@ -1155,42 +1100,37 @@ static void
model_resort_node (GeditFileBrowserStore *model,
FileBrowserNode *node)
{
- FileBrowserNodeDir *dir;
- GSList *item;
- FileBrowserNode *child;
- gint pos = 0;
- GtkTreeIter iter;
- GtkTreePath *path;
- gint *neworder;
-
- dir = FILE_BROWSER_NODE_DIR (node->parent);
+ FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (node->parent);
if (!model_node_visibility (model, node->parent))
{
/* Just sort the children of the parent */
- dir->children = g_slist_sort (dir->children,
- (GCompareFunc) (model->priv->sort_func));
+ dir->children = g_slist_sort (dir->children, (GCompareFunc)(model->priv->sort_func));
}
else
{
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ gint *neworder;
+ gint pos = 0;
+
/* Store current positions */
- for (item = dir->children; item; item = item->next)
+ for (GSList *item = dir->children; item; item = item->next)
{
- child = (FileBrowserNode *) (item->data);
+ FileBrowserNode *child = (FileBrowserNode *)(item->data);
if (model_node_visibility (model, child))
child->pos = pos++;
}
- dir->children = g_slist_sort (dir->children,
- (GCompareFunc) (model->priv->sort_func));
+ dir->children = g_slist_sort (dir->children, (GCompareFunc)(model->priv->sort_func));
neworder = g_new (gint, pos);
pos = 0;
/* Store the new positions */
- for (item = dir->children; item; item = item->next)
+ for (GSList *item = dir->children; item; item = item->next)
{
- child = (FileBrowserNode *) (item->data);
+ FileBrowserNode *child = (FileBrowserNode *)(item->data);
if (model_node_visibility (model, child))
neworder[pos++] = child->pos;
@@ -1199,8 +1139,7 @@ model_resort_node (GeditFileBrowserStore *model,
iter.user_data = node->parent;
path = gedit_file_browser_store_get_path_real (model, node->parent);
- gtk_tree_model_rows_reordered (GTK_TREE_MODEL (model),
- path, &iter, neworder);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (model), path, &iter, neworder);
g_free (neworder);
gtk_tree_path_free (path);
@@ -1277,9 +1216,7 @@ row_deleted (GeditFileBrowserStore *model,
node->inserted = FALSE;
if (hidden)
- {
node->flags |= GEDIT_FILE_BROWSER_STORE_FLAG_IS_HIDDEN;
- }
copy = gtk_tree_path_copy (path);
gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), copy);
@@ -1310,8 +1247,7 @@ model_refilter_node (GeditFileBrowserStore *model,
if (path == NULL)
{
if (in_tree)
- tmppath = gedit_file_browser_store_get_path_real (model,
- node);
+ tmppath = gedit_file_browser_store_get_path_real (model, node);
else
tmppath = gtk_tree_path_new_first ();
@@ -1326,11 +1262,7 @@ model_refilter_node (GeditFileBrowserStore *model,
dir = FILE_BROWSER_NODE_DIR (node);
for (item = dir->children; item; item = item->next)
- {
- model_refilter_node (model,
- (FileBrowserNode *) (item->data),
- path);
- }
+ model_refilter_node (model, (FileBrowserNode *)(item->data), path);
if (in_tree)
gtk_tree_path_up (*path);
@@ -1432,15 +1364,11 @@ static void
file_browser_node_free_children (GeditFileBrowserStore *model,
FileBrowserNode *node)
{
- GSList *item;
-
if (node == NULL || !NODE_IS_DIR (node))
return;
- for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
- {
- file_browser_node_free (model, (FileBrowserNode *) (item->data));
- }
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
+ file_browser_node_free (model, (FileBrowserNode *)(item->data));
g_slist_free (FILE_BROWSER_NODE_DIR (node)->children);
FILE_BROWSER_NODE_DIR (node)->children = NULL;
@@ -1458,9 +1386,7 @@ file_browser_node_free (GeditFileBrowserStore *model,
if (NODE_IS_DIR (node))
{
- FileBrowserNodeDir *dir;
-
- dir = FILE_BROWSER_NODE_DIR (node);
+ FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (node);
if (dir->cancellable)
{
@@ -1520,7 +1446,6 @@ model_remove_node_children (GeditFileBrowserStore *model,
FileBrowserNodeDir *dir;
GtkTreePath *path_child;
GSList *list;
- GSList *item;
if (node == NULL || !NODE_IS_DIR (node))
return;
@@ -1532,8 +1457,7 @@ model_remove_node_children (GeditFileBrowserStore *model,
if (!model_node_visibility (model, node))
{
- /* Node is invisible and therefore the children can just
- be freed */
+ /* Node is invisible and therefore the children can just be freed */
if (free_nodes)
file_browser_node_free_children (model, node);
@@ -1549,11 +1473,8 @@ model_remove_node_children (GeditFileBrowserStore *model,
list = g_slist_copy (dir->children);
- for (item = list; item; item = item->next)
- {
- model_remove_node (model, (FileBrowserNode *) (item->data),
- path_child, free_nodes);
- }
+ for (GSList *item = list; item; item = item->next)
+ model_remove_node (model, (FileBrowserNode *)(item->data), path_child, free_nodes);
g_slist_free (list);
gtk_tree_path_free (path_child);
@@ -1588,29 +1509,19 @@ model_remove_node (GeditFileBrowserStore *model,
model_remove_node_children (model, node, path, free_nodes);
- /* Only delete if the node is visible in the tree (but only when it's
- not the virtual root) */
+ /* Only delete if the node is visible in the tree (but only when it's not the virtual root) */
if (model_node_visibility (model, node) && node != model->priv->virtual_root)
- {
row_deleted (model, node, path);
- }
if (free_path)
gtk_tree_path_free (path);
parent = node->parent;
- if (free_nodes)
- {
- /* Remove the node from the parents children list */
- if (parent)
- {
- FILE_BROWSER_NODE_DIR (node->parent)->children =
- g_slist_remove (FILE_BROWSER_NODE_DIR
- (node->parent)->children,
- node);
- }
- }
+ /* Remove the node from the parents children list */
+ if (free_nodes && parent)
+ FILE_BROWSER_NODE_DIR (node->parent)->children =
+ g_slist_remove (FILE_BROWSER_NODE_DIR (node->parent)->children, node);
/* If this is the virtual root, than set the parent as the virtual root */
if (node == model->priv->virtual_root)
@@ -1636,28 +1547,21 @@ static void
model_clear (GeditFileBrowserStore *model,
gboolean free_nodes)
{
- GtkTreePath *path;
+ GtkTreePath *path = gtk_tree_path_new ();
- path = gtk_tree_path_new ();
- model_remove_node_children (model, model->priv->virtual_root, path,
- free_nodes);
+ model_remove_node_children (model, model->priv->virtual_root, path, free_nodes);
gtk_tree_path_free (path);
/* Remove the dummy if there is one */
if (model->priv->virtual_root)
{
- FileBrowserNodeDir *dir;
-
- dir = FILE_BROWSER_NODE_DIR (model->priv->virtual_root);
+ FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (model->priv->virtual_root);
if (dir->children != NULL)
{
- FileBrowserNode *dummy;
-
- dummy = (FileBrowserNode *) (dir->children->data);
+ FileBrowserNode *dummy = (FileBrowserNode *)(dir->children->data);
- if (NODE_IS_DUMMY (dummy) &&
- model_node_visibility (model, dummy))
+ if (NODE_IS_DUMMY (dummy) && model_node_visibility (model, dummy))
{
path = gtk_tree_path_new_first ();
row_deleted (model, dummy, path);
@@ -1747,12 +1651,11 @@ model_recomposite_icon_real (GeditFileBrowserStore *tree_model,
if (icon == NULL)
{
- node->icon =
- gdk_pixbuf_new (gdk_pixbuf_get_colorspace (node->emblem),
- gdk_pixbuf_get_has_alpha (node->emblem),
- gdk_pixbuf_get_bits_per_sample (node->emblem),
- icon_size,
- icon_size);
+ node->icon = gdk_pixbuf_new (gdk_pixbuf_get_colorspace (node->emblem),
+ gdk_pixbuf_get_has_alpha (node->emblem),
+ gdk_pixbuf_get_bits_per_sample (node->emblem),
+ icon_size,
+ icon_size);
}
else
{
@@ -1780,7 +1683,7 @@ model_recomposite_icon (GeditFileBrowserStore *tree_model,
g_return_if_fail (iter->user_data != NULL);
model_recomposite_icon_real (tree_model,
- (FileBrowserNode *) (iter->user_data),
+ (FileBrowserNode *)(iter->user_data),
NULL);
}
@@ -1823,13 +1726,11 @@ model_check_dummy (GeditFileBrowserStore *model,
/* Hide the dummy child if needed */
if (NODE_IS_DIR (node))
{
+ FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (node);
FileBrowserNode *dummy;
GtkTreeIter iter;
GtkTreePath *path;
guint flags;
- FileBrowserNodeDir *dir;
-
- dir = FILE_BROWSER_NODE_DIR (node);
if (dir->children == NULL)
{
@@ -1837,7 +1738,7 @@ model_check_dummy (GeditFileBrowserStore *model,
return;
}
- dummy = (FileBrowserNode *) (dir->children->data);
+ dummy = (FileBrowserNode *)(dir->children->data);
if (!NODE_IS_DUMMY (dummy))
{
@@ -1864,9 +1765,7 @@ model_check_dummy (GeditFileBrowserStore *model,
{
/* Was hidden, needs to be inserted */
iter.user_data = dummy;
- path =
- gedit_file_browser_store_get_path_real
- (model, dummy);
+ path = gedit_file_browser_store_get_path_real (model, dummy);
row_inserted (model, &path, &iter);
gtk_tree_path_free (path);
@@ -1892,20 +1791,12 @@ insert_node_sorted (GeditFileBrowserStore *model,
FileBrowserNode *child,
FileBrowserNode *parent)
{
- FileBrowserNodeDir *dir;
-
- dir = FILE_BROWSER_NODE_DIR (parent);
+ FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (parent);
if (model->priv->sort_func == NULL)
- {
dir->children = g_slist_append (dir->children, child);
- }
else
- {
- dir->children =
- g_slist_insert_sorted (dir->children, child,
- (GCompareFunc) (model->priv->sort_func));
- }
+ dir->children = g_slist_insert_sorted (dir->children, child,
(GCompareFunc)(model->priv->sort_func));
}
static void
@@ -1919,11 +1810,10 @@ model_add_node (GeditFileBrowserStore *model,
if (model_node_visibility (model, parent) &&
model_node_visibility (model, child))
{
+ GtkTreePath *path = gedit_file_browser_store_get_path_real (model, child);
GtkTreeIter iter;
- GtkTreePath *path;
iter.user_data = child;
- path = gedit_file_browser_store_get_path_real (model, child);
/* Emit row inserted */
row_inserted (model, &path, &iter);
@@ -1939,19 +1829,11 @@ model_add_nodes_batch (GeditFileBrowserStore *model,
GSList *children,
FileBrowserNode *parent)
{
- GSList *sorted_children;
- GSList *child;
- GSList *prev;
- GSList *l;
- FileBrowserNodeDir *dir;
-
- dir = FILE_BROWSER_NODE_DIR (parent);
-
- sorted_children = g_slist_sort (children, (GCompareFunc) model->priv->sort_func);
-
- child = sorted_children;
- l = dir->children;
- prev = NULL;
+ FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (parent);
+ GSList *sorted_children = g_slist_sort (children, (GCompareFunc)model->priv->sort_func);
+ GSList *child = sorted_children;
+ GSList *prev = NULL;
+ GSList *l = dir->children;
model_check_dummy (model, parent);
@@ -2053,17 +1935,13 @@ content_type_is_text (gchar const *content_type)
#endif
if (!content_type || g_content_type_is_unknown (content_type))
- {
return TRUE;
- }
#ifndef G_OS_WIN32
return g_content_type_is_a (content_type, "text/plain");
#else
if (g_content_type_is_a (content_type, "text"))
- {
return TRUE;
- }
/* This covers a rare case in which on Windows the PerceivedType is
not set to "text" but the Content Type is set to text/plain */
@@ -2104,8 +1982,8 @@ file_browser_node_set_from_info (GeditFileBrowserStore *model,
g_warning ("Could not get info for %s: %s", uri, error->message);
g_free (uri);
}
- g_error_free (error);
+ g_error_free (error);
return;
}
@@ -2113,9 +1991,7 @@ file_browser_node_set_from_info (GeditFileBrowserStore *model,
}
if (g_file_info_get_is_hidden (info) || g_file_info_get_is_backup (info))
- {
node->flags |= GEDIT_FILE_BROWSER_STORE_FLAG_IS_HIDDEN;
- }
if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
{
@@ -2124,14 +2000,10 @@ file_browser_node_set_from_info (GeditFileBrowserStore *model,
else
{
if (!(content = backup_content_type (info)))
- {
content = g_file_info_get_content_type (info);
- }
if (content_type_is_text (content))
- {
node->flags |= GEDIT_FILE_BROWSER_STORE_FLAG_IS_TEXT;
- }
}
model_recomposite_icon_real (model, node, info);
@@ -2157,19 +2029,12 @@ static FileBrowserNode *
node_list_contains_file (GSList *children,
GFile *file)
{
- GSList *item;
-
- for (item = children; item; item = item->next)
+ for (GSList *item = children; item; item = item->next)
{
- FileBrowserNode *node;
-
- node = (FileBrowserNode *) (item->data);
+ FileBrowserNode *node = (FileBrowserNode *)(item->data);
- if (node->file != NULL &&
- g_file_equal (node->file, file))
- {
+ if (node->file != NULL && g_file_equal (node->file, file))
return node;
- }
}
return NULL;
@@ -2233,19 +2098,16 @@ model_add_nodes_from_files (GeditFileBrowserStore *model,
GSList *original_children,
GList *files)
{
- GList *item;
GSList *nodes = NULL;
- for (item = files; item; item = item->next)
+ for (GList *item = files; item; item = item->next)
{
GFileInfo *info = G_FILE_INFO (item->data);
- GFileType type;
+ GFileType type = g_file_info_get_file_type (info);
gchar const *name;
GFile *file;
FileBrowserNode *node;
- type = g_file_info_get_file_type (info);
-
/* Skip all non regular, non directory files */
if (type != G_FILE_TYPE_REGULAR &&
type != G_FILE_TYPE_DIRECTORY &&
@@ -2267,8 +2129,7 @@ model_add_nodes_from_files (GeditFileBrowserStore *model,
}
file = g_file_get_child (parent->file, name);
- node = node_list_contains_file (original_children, file);
- if (node == NULL)
+ if (!(node = node_list_contains_file (original_children, file)))
{
if (type == G_FILE_TYPE_DIRECTORY)
node = file_browser_node_dir_new (model, file, parent);
@@ -2320,8 +2181,8 @@ on_directory_monitor_event (GFileMonitor *monitor,
GFileMonitorEvent event_type,
FileBrowserNode *parent)
{
- FileBrowserNode *node;
FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (parent);
+ FileBrowserNode *node;
switch (event_type)
{
@@ -2354,13 +2215,11 @@ model_iterate_next_files_cb (GFileEnumerator *enumerator,
GAsyncResult *result,
AsyncNode *async)
{
- GList *files;
GError *error = NULL;
+ GList *files = g_file_enumerator_next_files_finish (enumerator, result, &error);
FileBrowserNodeDir *dir = async->dir;
FileBrowserNode *parent = (FileBrowserNode *)dir;
- files = g_file_enumerator_next_files_finish (enumerator, result, &error);
-
if (files == NULL)
{
g_file_enumerator_close (enumerator, NULL, NULL);
@@ -2456,9 +2315,7 @@ model_iterate_children_cb (GFile *file,
return;
}
- enumerator = g_file_enumerate_children_finish (file, result, &error);
-
- if (enumerator == NULL)
+ if (!(enumerator = g_file_enumerate_children_finish (file, result, &error)))
{
/* Simply return if we were cancelled or if the dir is not there */
FileBrowserNodeDir *dir = async->dir;
@@ -2607,26 +2464,22 @@ static void
set_virtual_root_from_node (GeditFileBrowserStore *model,
FileBrowserNode *node)
{
- FileBrowserNode *next;
- FileBrowserNode *prev;
+ FileBrowserNode *prev = node;
+ FileBrowserNode *next = prev->parent;
FileBrowserNode *check;
FileBrowserNodeDir *dir;
- GSList *item;
GSList *copy;
GtkTreePath *empty = NULL;
- prev = node;
- next = prev->parent;
-
/* Free all the nodes below that we don't need in cache */
while (prev != model->priv->root)
{
dir = FILE_BROWSER_NODE_DIR (next);
copy = g_slist_copy (dir->children);
- for (item = copy; item; item = item->next)
+ for (GSList *item = copy; item; item = item->next)
{
- check = (FileBrowserNode *) (item->data);
+ check = (FileBrowserNode *)(item->data);
if (prev == node)
{
@@ -2634,9 +2487,7 @@ set_virtual_root_from_node (GeditFileBrowserStore *model,
if (check != node)
{
file_browser_node_free_children (model, check);
- file_browser_node_unload (model,
- check,
- FALSE);
+ file_browser_node_unload (model, check, FALSE);
}
}
else if (check != prev)
@@ -2656,19 +2507,16 @@ set_virtual_root_from_node (GeditFileBrowserStore *model,
}
/* Free all the nodes up that we don't need in cache */
- for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
{
- check = (FileBrowserNode *) (item->data);
+ check = (FileBrowserNode *)(item->data);
if (NODE_IS_DIR (check))
{
for (copy = FILE_BROWSER_NODE_DIR (check)->children; copy; copy = copy->next)
{
- file_browser_node_free_children (model,
- (FileBrowserNode*) (copy->data));
- file_browser_node_unload (model,
- (FileBrowserNode*) (copy->data),
- FALSE);
+ file_browser_node_free_children (model, (FileBrowserNode*) (copy->data));
+ file_browser_node_unload (model, (FileBrowserNode*) (copy->data), FALSE);
}
}
else if (NODE_IS_DUMMY (check))
@@ -2695,7 +2543,6 @@ set_virtual_root_from_file (GeditFileBrowserStore *model,
GFile *file)
{
GList *files;
- GList *item;
FileBrowserNode *parent;
GFile *check;
@@ -2706,7 +2553,7 @@ set_virtual_root_from_file (GeditFileBrowserStore *model,
files = get_parent_files (model, file);
parent = model->priv->root;
- for (item = files; item; item = item->next)
+ for (GList *item = files; item; item = item->next)
{
check = G_FILE (item->data);
@@ -2726,14 +2573,13 @@ model_find_node_children (GeditFileBrowserStore *model,
FileBrowserNodeDir *dir;
FileBrowserNode *child;
FileBrowserNode *result;
- GSList *children;
if (!NODE_IS_DIR (parent))
return NULL;
dir = FILE_BROWSER_NODE_DIR (parent);
- for (children = dir->children; children; children = children->next)
+ for (GSList *children = dir->children; children; children = children->next)
{
child = (FileBrowserNode *)(children->data);
@@ -2815,8 +2661,7 @@ model_root_mounted (GeditFileBrowserStore *model,
}
else
{
- set_virtual_root_from_node (model,
- model->priv->root);
+ set_virtual_root_from_node (model, model->priv->root);
}
return GEDIT_FILE_BROWSER_STORE_RESULT_OK;
@@ -2886,9 +2731,7 @@ mount_cb (GFile *file,
g_object_unref (mount_info->cancellable);
if (mount_info->virtual_root)
- {
g_object_unref (mount_info->virtual_root);
- }
g_slice_free (MountInfo, mount_info);
}
@@ -2973,7 +2816,7 @@ gedit_file_browser_store_set_value (GeditFileBrowserStore *tree_model,
g_return_if_fail (iter != NULL);
g_return_if_fail (iter->user_data != NULL);
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
if (column == GEDIT_FILE_BROWSER_STORE_COLUMN_MARKUP)
{
@@ -3013,8 +2856,7 @@ gedit_file_browser_store_set_value (GeditFileBrowserStore *tree_model,
if (model_node_visibility (tree_model, node))
{
- path = gedit_file_browser_store_get_path (GTK_TREE_MODEL (tree_model),
- iter);
+ path = gedit_file_browser_store_get_path (GTK_TREE_MODEL (tree_model), iter);
row_changed (tree_model, &path, iter);
gtk_tree_path_free (path);
}
@@ -3024,16 +2866,12 @@ GeditFileBrowserStoreResult
gedit_file_browser_store_set_virtual_root (GeditFileBrowserStore *model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model),
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
- g_return_val_if_fail (iter != NULL,
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
- g_return_val_if_fail (iter->user_data != NULL,
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model), GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (iter != NULL, GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (iter->user_data != NULL, GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
model_clear (model, FALSE);
- set_virtual_root_from_node (model,
- (FileBrowserNode *) (iter->user_data));
+ set_virtual_root_from_node (model, (FileBrowserNode *)(iter->user_data));
return TRUE;
}
@@ -3042,25 +2880,20 @@ GeditFileBrowserStoreResult
gedit_file_browser_store_set_virtual_root_from_location (GeditFileBrowserStore *model,
GFile *root)
{
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model),
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model), GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
if (root == NULL)
{
- gchar *uri;
+ gchar *uri = g_file_get_uri (root);
- uri = g_file_get_uri (root);
g_warning ("Invalid uri (%s)", uri);
g_free (uri);
return GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE;
}
/* Check if uri is already the virtual root */
- if (model->priv->virtual_root &&
- g_file_equal (model->priv->virtual_root->file, root))
- {
+ if (model->priv->virtual_root && g_file_equal (model->priv->virtual_root->file, root))
return GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE;
- }
/* Check if uri is the root itself */
if (g_file_equal (model->priv->root->file, root))
@@ -3073,13 +2906,10 @@ gedit_file_browser_store_set_virtual_root_from_location (GeditFileBrowserStore *
if (!g_file_has_prefix (root, model->priv->root->file))
{
- gchar *str, *str1;
-
- str = g_file_get_parse_name (model->priv->root->file);
- str1 = g_file_get_parse_name (root);
+ gchar *str = g_file_get_parse_name (model->priv->root->file);
+ gchar *str1 = g_file_get_parse_name (root);
- g_warning ("Virtual root (%s) is not below actual root (%s)",
- str1, str);
+ g_warning ("Virtual root (%s) is not below actual root (%s)", str1, str);
g_free (str);
g_free (str1);
@@ -3095,8 +2925,7 @@ gedit_file_browser_store_set_virtual_root_from_location (GeditFileBrowserStore *
GeditFileBrowserStoreResult
gedit_file_browser_store_set_virtual_root_top (GeditFileBrowserStore *model)
{
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model),
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model), GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
if (model->priv->virtual_root == model->priv->root)
return GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE;
@@ -3110,15 +2939,13 @@ gedit_file_browser_store_set_virtual_root_top (GeditFileBrowserStore *model)
GeditFileBrowserStoreResult
gedit_file_browser_store_set_virtual_root_up (GeditFileBrowserStore *model)
{
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model),
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model), GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
if (model->priv->virtual_root == model->priv->root)
return GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE;
model_clear (model, FALSE);
- set_virtual_root_from_node (model,
- model->priv->virtual_root->parent);
+ set_virtual_root_from_node (model, model->priv->virtual_root->parent);
return GEDIT_FILE_BROWSER_STORE_RESULT_OK;
}
@@ -3181,8 +3008,7 @@ gedit_file_browser_store_set_root_and_virtual_root (GeditFileBrowserStore *model
FileBrowserNode *node;
gboolean equal = FALSE;
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model),
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model), GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
if (root == NULL && model->priv->root == NULL)
return GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE;
@@ -3232,12 +3058,9 @@ GeditFileBrowserStoreResult
gedit_file_browser_store_set_root (GeditFileBrowserStore *model,
GFile *root)
{
- g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model),
- GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
+ g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model), GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
- return gedit_file_browser_store_set_root_and_virtual_root (model,
- root,
- NULL);
+ return gedit_file_browser_store_set_root_and_virtual_root (model, root, NULL);
}
GFile *
@@ -3272,7 +3095,7 @@ _gedit_file_browser_store_iter_expanded (GeditFileBrowserStore *model,
g_return_if_fail (iter != NULL);
g_return_if_fail (iter->user_data != NULL);
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
if (NODE_IS_DIR (node) && !NODE_LOADED (node))
{
@@ -3286,26 +3109,24 @@ _gedit_file_browser_store_iter_collapsed (GeditFileBrowserStore *model,
GtkTreeIter *iter)
{
FileBrowserNode *node;
- GSList *item;
g_return_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model));
g_return_if_fail (iter != NULL);
g_return_if_fail (iter->user_data != NULL);
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
if (NODE_IS_DIR (node) && NODE_LOADED (node))
{
/* Unload children of the children, keeping 1 depth in cache */
- for (item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
+ for (GSList *item = FILE_BROWSER_NODE_DIR (node)->children; item; item = item->next)
{
- node = (FileBrowserNode *) (item->data);
+ node = (FileBrowserNode *)(item->data);
if (NODE_IS_DIR (node) && NODE_LOADED (node))
{
- file_browser_node_unload (model, node,
- TRUE);
+ file_browser_node_unload (model, node, TRUE);
model_check_dummy (model, node);
}
}
@@ -3348,7 +3169,7 @@ gedit_file_browser_store_set_filter_func (GeditFileBrowserStore *model
const gchar * const *
gedit_file_browser_store_get_binary_patterns (GeditFileBrowserStore *model)
{
- return (const gchar * const *) model->priv->binary_patterns;
+ return (const gchar * const *)model->priv->binary_patterns;
}
void
@@ -3363,7 +3184,7 @@ gedit_file_browser_store_set_binary_patterns (GeditFileBrowserStore *model,
g_ptr_array_unref (model->priv->binary_pattern_specs);
}
- model->priv->binary_patterns = g_strdupv ((gchar **) binary_patterns);
+ model->priv->binary_patterns = g_strdupv ((gchar **)binary_patterns);
if (binary_patterns == NULL)
{
@@ -3371,20 +3192,13 @@ gedit_file_browser_store_set_binary_patterns (GeditFileBrowserStore *model,
}
else
{
- gint i;
- gssize n_patterns;
-
- n_patterns = g_strv_length ((gchar **) binary_patterns);
+ gssize n_patterns = g_strv_length ((gchar **) binary_patterns);
model->priv->binary_pattern_specs = g_ptr_array_sized_new (n_patterns);
- g_ptr_array_set_free_func (model->priv->binary_pattern_specs,
- (GDestroyNotify) g_pattern_spec_free);
+ g_ptr_array_set_free_func (model->priv->binary_pattern_specs, (GDestroyNotify)
g_pattern_spec_free);
- for (i = 0; binary_patterns[i] != NULL; ++i)
- {
- g_ptr_array_add (model->priv->binary_pattern_specs,
- g_pattern_spec_new (binary_patterns[i]));
- }
+ for (guint i = 0; binary_patterns[i] != NULL; ++i)
+ g_ptr_array_add (model->priv->binary_pattern_specs, g_pattern_spec_new
(binary_patterns[i]));
}
model_refilter (model);
@@ -3428,11 +3242,9 @@ reparent_node (FileBrowserNode *node,
if (reparent)
{
- GFile *parent;
- gchar *base;
+ GFile *parent = node->parent->file;
+ gchar *base = g_file_get_basename (node->file);
- parent = node->parent->file;
- base = g_file_get_basename (node->file);
g_object_unref (node->file);
node->file = g_file_get_child (parent, base);
@@ -3441,15 +3253,10 @@ reparent_node (FileBrowserNode *node,
if (NODE_IS_DIR (node))
{
- FileBrowserNodeDir *dir;
- GSList *child;
+ FileBrowserNodeDir *dir = FILE_BROWSER_NODE_DIR (node);
- dir = FILE_BROWSER_NODE_DIR (node);
-
- for (child = dir->children; child; child = child->next)
- {
+ for (GSList *child = dir->children; child; child = child->next)
reparent_node ((FileBrowserNode *)child->data, TRUE);
- }
}
}
@@ -3470,7 +3277,7 @@ gedit_file_browser_store_rename (GeditFileBrowserStore *model,
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
parent = g_file_get_parent (node->file);
g_return_val_if_fail (parent != NULL, FALSE);
@@ -3578,13 +3385,9 @@ delete_file_finished (GFile *file,
gboolean ok;
if (data->trash)
- {
ok = g_file_trash_finish (file, res, &error);
- }
else
- {
ok = g_file_delete_finish (file, res, &error);
- }
if (ok)
{
@@ -3592,9 +3395,7 @@ delete_file_finished (GFile *file,
FileBrowserNode *node = model_find_node (data->model, NULL, file);
if (node != NULL)
- {
model_remove_node (data->model, node, NULL, TRUE);
- }
/* Process the next file */
data->iter = data->iter->next;
@@ -3736,7 +3537,7 @@ gedit_file_browser_store_delete (GeditFileBrowserStore *model,
g_return_val_if_fail (iter != NULL, GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
g_return_val_if_fail (iter->user_data != NULL, GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE);
- node = (FileBrowserNode *) (iter->user_data);
+ node = (FileBrowserNode *)(iter->user_data);
if (NODE_IS_DUMMY (node))
return GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE;
@@ -3821,9 +3622,7 @@ gedit_file_browser_store_new_directory (GeditFileBrowserStore *model,
g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_STORE (model), FALSE);
g_return_val_if_fail (parent != NULL, FALSE);
g_return_val_if_fail (parent->user_data != NULL, FALSE);
- g_return_val_if_fail (NODE_IS_DIR
- ((FileBrowserNode *) (parent->user_data)),
- FALSE);
+ g_return_val_if_fail (NODE_IS_DIR ((FileBrowserNode *)(parent->user_data)), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
parent_node = FILE_BROWSER_NODE_DIR (parent->user_data);
@@ -3832,9 +3631,7 @@ gedit_file_browser_store_new_directory (GeditFileBrowserStore *model,
if (!g_file_make_directory (file, NULL, &error))
{
- g_signal_emit (model, model_signals[ERROR], 0,
- GEDIT_FILE_BROWSER_ERROR_NEW_DIRECTORY,
- error->message);
+ g_signal_emit (model, model_signals[ERROR], 0, GEDIT_FILE_BROWSER_ERROR_NEW_DIRECTORY,
error->message);
g_error_free (error);
}
else
diff --git a/plugins/filebrowser/gedit-file-browser-store.h b/plugins/filebrowser/gedit-file-browser-store.h
index fd403f923..cbf8f3c4c 100644
--- a/plugins/filebrowser/gedit-file-browser-store.h
+++ b/plugins/filebrowser/gedit-file-browser-store.h
@@ -118,91 +118,68 @@ struct _GeditFileBrowserStoreClass {
GtkTreePath *path);
};
-GType gedit_file_browser_store_get_type (void) G_GNUC_CONST;
-
-GeditFileBrowserStore *gedit_file_browser_store_new (GFile *root);
-
-GeditFileBrowserStoreResult
-gedit_file_browser_store_set_root_and_virtual_root (GeditFileBrowserStore *model,
- GFile *root,
- GFile
*virtual_root);
-GeditFileBrowserStoreResult
-gedit_file_browser_store_set_root (GeditFileBrowserStore *model,
- GFile *root);
-GeditFileBrowserStoreResult
-gedit_file_browser_store_set_virtual_root (GeditFileBrowserStore *model,
- GtkTreeIter *iter);
-GeditFileBrowserStoreResult
-gedit_file_browser_store_set_virtual_root_from_location (GeditFileBrowserStore
*model,
- GFile *root);
-GeditFileBrowserStoreResult
-gedit_file_browser_store_set_virtual_root_up (GeditFileBrowserStore *model);
-GeditFileBrowserStoreResult
-gedit_file_browser_store_set_virtual_root_top (GeditFileBrowserStore *model);
-
-gboolean gedit_file_browser_store_get_iter_virtual_root (GeditFileBrowserStore *model,
- GtkTreeIter *iter);
-gboolean gedit_file_browser_store_get_iter_root (GeditFileBrowserStore *model,
- GtkTreeIter *iter);
-GFile *gedit_file_browser_store_get_root (GeditFileBrowserStore *model);
-GFile *gedit_file_browser_store_get_virtual_root (GeditFileBrowserStore *model);
-
-gboolean gedit_file_browser_store_iter_equal (GeditFileBrowserStore *model,
- GtkTreeIter *iter1,
- GtkTreeIter *iter2);
-
-void gedit_file_browser_store_set_value (GeditFileBrowserStore *tree_model,
- GtkTreeIter *iter,
- gint column,
- GValue *value);
-
-void _gedit_file_browser_store_iter_expanded (GeditFileBrowserStore *model,
- GtkTreeIter *iter);
-void _gedit_file_browser_store_iter_collapsed (GeditFileBrowserStore *model,
- GtkTreeIter *iter);
-
-GeditFileBrowserStoreFilterMode
-gedit_file_browser_store_get_filter_mode (GeditFileBrowserStore *model);
-void gedit_file_browser_store_set_filter_mode (GeditFileBrowserStore *model,
- GeditFileBrowserStoreFilterMode mode);
-void gedit_file_browser_store_set_filter_func (GeditFileBrowserStore *model,
- GeditFileBrowserStoreFilterFunc func,
- gpointer user_data);
-
-const gchar * const *
- gedit_file_browser_store_get_binary_patterns (GeditFileBrowserStore *model);
-void gedit_file_browser_store_set_binary_patterns (GeditFileBrowserStore *model,
- const gchar
**binary_patterns);
-
-void gedit_file_browser_store_refilter (GeditFileBrowserStore *model);
-GeditFileBrowserStoreFilterMode
-gedit_file_browser_store_filter_mode_get_default (void);
-
-void gedit_file_browser_store_refresh (GeditFileBrowserStore *model);
-gboolean gedit_file_browser_store_rename (GeditFileBrowserStore
*model,
- GtkTreeIter *iter,
- gchar const *new_name,
- GError **error);
-GeditFileBrowserStoreResult
-gedit_file_browser_store_delete (GeditFileBrowserStore
*model,
- GtkTreeIter *iter,
- gboolean trash);
-GeditFileBrowserStoreResult
-gedit_file_browser_store_delete_all (GeditFileBrowserStore *model,
- GList *rows,
- gboolean trash);
-
-gboolean gedit_file_browser_store_new_file (GeditFileBrowserStore *model,
- GtkTreeIter *parent,
- GtkTreeIter *iter);
-gboolean gedit_file_browser_store_new_directory (GeditFileBrowserStore *model,
- GtkTreeIter *parent,
- GtkTreeIter *iter);
-
-void
-gedit_file_browser_store_cancel_mount_operation (GeditFileBrowserStore
*store);
-
-void _gedit_file_browser_store_register_type (GTypeModule
*type_module);
+GType gedit_file_browser_store_get_type (void) G_GNUC_CONST;
+
+GeditFileBrowserStore *gedit_file_browser_store_new (GFile
*root);
+GeditFileBrowserStoreResult gedit_file_browser_store_set_root_and_virtual_root
(GeditFileBrowserStore *model,
+ GFile
*root,
+ GFile
*virtual_root);
+GeditFileBrowserStoreResult gedit_file_browser_store_set_root
(GeditFileBrowserStore *model,
+ GFile
*root);
+GeditFileBrowserStoreResult gedit_file_browser_store_set_virtual_root
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter);
+GeditFileBrowserStoreResult gedit_file_browser_store_set_virtual_root_from_location
(GeditFileBrowserStore *model,
+ GFile
*root);
+GeditFileBrowserStoreResult gedit_file_browser_store_set_virtual_root_up
(GeditFileBrowserStore *model);
+GeditFileBrowserStoreResult gedit_file_browser_store_set_virtual_root_top
(GeditFileBrowserStore *model);
+gboolean gedit_file_browser_store_get_iter_virtual_root
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter);
+gboolean gedit_file_browser_store_get_iter_root
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter);
+GFile *gedit_file_browser_store_get_root
(GeditFileBrowserStore *model);
+GFile *gedit_file_browser_store_get_virtual_root
(GeditFileBrowserStore *model);
+gboolean gedit_file_browser_store_iter_equal
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter1,
+ GtkTreeIter
*iter2);
+void gedit_file_browser_store_set_value
(GeditFileBrowserStore *tree_model,
+ GtkTreeIter
*iter,
+ gint
column,
+ GValue
*value);
+void _gedit_file_browser_store_iter_expanded
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter);
+void _gedit_file_browser_store_iter_collapsed
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter);
+GeditFileBrowserStoreFilterMode gedit_file_browser_store_get_filter_mode
(GeditFileBrowserStore *model);
+void gedit_file_browser_store_set_filter_mode
(GeditFileBrowserStore *model,
+
GeditFileBrowserStoreFilterMode mode);
+void gedit_file_browser_store_set_filter_func
(GeditFileBrowserStore *model,
+
GeditFileBrowserStoreFilterFunc func,
+ gpointer
user_data);
+const gchar * const *gedit_file_browser_store_get_binary_patterns
(GeditFileBrowserStore *model);
+void gedit_file_browser_store_set_binary_patterns
(GeditFileBrowserStore *model,
+ const gchar
**binary_patterns);
+void gedit_file_browser_store_refilter
(GeditFileBrowserStore *model);
+GeditFileBrowserStoreFilterMode gedit_file_browser_store_filter_mode_get_default (void);
+void gedit_file_browser_store_refresh
(GeditFileBrowserStore *model);
+gboolean gedit_file_browser_store_rename
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter,
+ gchar const
*new_name,
+ GError
**error);
+GeditFileBrowserStoreResult gedit_file_browser_store_delete
(GeditFileBrowserStore *model,
+ GtkTreeIter
*iter,
+ gboolean
trash);
+GeditFileBrowserStoreResult gedit_file_browser_store_delete_all
(GeditFileBrowserStore *model,
+ GList
*rows,
+ gboolean
trash);
+gboolean gedit_file_browser_store_new_file
(GeditFileBrowserStore *model,
+ GtkTreeIter
*parent,
+ GtkTreeIter
*iter);
+gboolean gedit_file_browser_store_new_directory
(GeditFileBrowserStore *model,
+ GtkTreeIter
*parent,
+ GtkTreeIter
*iter);
+void gedit_file_browser_store_cancel_mount_operation
(GeditFileBrowserStore *store);
+
+void _gedit_file_browser_store_register_type (GTypeModule
*type_module);
G_END_DECLS
diff --git a/plugins/filebrowser/gedit-file-browser-view.c b/plugins/filebrowser/gedit-file-browser-view.c
index d25c1af7c..2e3fa8925 100644
--- a/plugins/filebrowser/gedit-file-browser-view.c
+++ b/plugins/filebrowser/gedit-file-browser-view.c
@@ -31,30 +31,30 @@
struct _GeditFileBrowserViewPrivate
{
- GtkTreeViewColumn *column;
- GtkCellRenderer *pixbuf_renderer;
- GtkCellRenderer *text_renderer;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *pixbuf_renderer;
+ GtkCellRenderer *text_renderer;
- GtkTreeModel *model;
+ GtkTreeModel *model;
/* Used when renaming */
- gchar *orig_markup;
- GtkTreeRowReference *editable;
+ gchar *orig_markup;
+ GtkTreeRowReference *editable;
/* Click policy */
- GeditFileBrowserViewClickPolicy click_policy;
+ GeditFileBrowserViewClickPolicy click_policy;
/* Both clicks in a double click need to be on the same row */
- GtkTreePath *double_click_path[2];
- GtkTreePath *hover_path;
- GdkCursor *hand_cursor;
- gboolean ignore_release;
- gboolean selected_on_button_down;
- gint drag_button;
- gboolean drag_started;
-
- gboolean restore_expand_state;
- gboolean is_refresh;
- GHashTable *expand_state;
+ GtkTreePath *double_click_path[2];
+ GtkTreePath *hover_path;
+ GdkCursor *hand_cursor;
+ gboolean ignore_release;
+ gboolean selected_on_button_down;
+ gint drag_button;
+ gboolean drag_started;
+
+ gboolean restore_expand_state;
+ gboolean is_refresh;
+ GHashTable *expand_state;
};
/* Properties */
@@ -168,8 +168,7 @@ row_expanded (GtkTreeView *tree_view,
gtk_tree_model_get (view->priv->model,
iter,
- GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION,
- &location,
+ GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION, &location,
-1);
add_expand_state (view, location);
@@ -201,8 +200,7 @@ row_collapsed (GtkTreeView *tree_view,
gtk_tree_model_get (view->priv->model,
iter,
- GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION,
- &location,
+ GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION, &location,
-1);
remove_expand_state (view, location);
@@ -300,25 +298,21 @@ static void
set_click_policy_property (GeditFileBrowserView *obj,
GeditFileBrowserViewClickPolicy click_policy)
{
- GdkDisplay *display;
- GtkTreeIter iter;
- GdkWindow *win;
-
- display = gtk_widget_get_display (GTK_WIDGET (obj));
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (obj));
obj->priv->click_policy = click_policy;
if (click_policy == GEDIT_FILE_BROWSER_VIEW_CLICK_POLICY_SINGLE)
{
if (obj->priv->hand_cursor == NULL)
- {
obj->priv->hand_cursor = gdk_cursor_new_from_name (display, "pointer");
- }
}
else if (click_policy == GEDIT_FILE_BROWSER_VIEW_CLICK_POLICY_DOUBLE)
{
if (obj->priv->hover_path != NULL)
{
+ GtkTreeIter iter;
+
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (obj->priv->model),
&iter, obj->priv->hover_path))
{
@@ -332,13 +326,12 @@ set_click_policy_property (GeditFileBrowserView *obj,
if (gtk_widget_get_realized (GTK_WIDGET (obj)))
{
- win = gtk_widget_get_window (GTK_WIDGET (obj));
+ GdkWindow *win = gtk_widget_get_window (GTK_WIDGET (obj));
+
gdk_window_set_cursor (win, NULL);
if (display != NULL)
- {
gdk_display_flush (display);
- }
}
if (obj->priv->hand_cursor)
@@ -361,14 +354,13 @@ activate_selected_files (GeditFileBrowserView *view)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (view);
GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
- GList *rows, *row;
+ GList *rows = gtk_tree_selection_get_selected_rows (selection, &view->priv->model);
+ GList *row;
GtkTreePath *directory = NULL;
GtkTreePath *path;
GtkTreeIter iter;
GeditFileBrowserStoreFlag flags;
- rows = gtk_tree_selection_get_selected_rows (selection, &view->priv->model);
-
for (row = rows; row; row = row->next)
{
path = (GtkTreePath *)(row->data);
@@ -435,11 +427,9 @@ toggle_hidden_filter (GeditFileBrowserView *view)
if (GEDIT_IS_FILE_BROWSER_STORE (view->priv->model))
{
- mode = gedit_file_browser_store_get_filter_mode
- (GEDIT_FILE_BROWSER_STORE (view->priv->model));
+ mode = gedit_file_browser_store_get_filter_mode (GEDIT_FILE_BROWSER_STORE
(view->priv->model));
mode ^= GEDIT_FILE_BROWSER_STORE_FILTER_MODE_HIDE_HIDDEN;
- gedit_file_browser_store_set_filter_mode
- (GEDIT_FILE_BROWSER_STORE (view->priv->model), mode);
+ gedit_file_browser_store_set_filter_mode (GEDIT_FILE_BROWSER_STORE (view->priv->model), mode);
}
}
@@ -466,15 +456,11 @@ static void
did_not_drag (GeditFileBrowserView *view,
GdkEventButton *event)
{
- GtkTreeView *tree_view;
- GtkTreeSelection *selection;
+ GtkTreeView *tree_view = GTK_TREE_VIEW (view);
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
GtkTreePath *path;
- tree_view = GTK_TREE_VIEW (view);
- selection = gtk_tree_view_get_selection (tree_view);
-
- if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y,
- &path, NULL, NULL, NULL))
+ if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y, &path, NULL, NULL, NULL))
{
if ((view->priv->click_policy == GEDIT_FILE_BROWSER_VIEW_CLICK_POLICY_SINGLE) &&
!button_event_modifies_selection (event) &&
@@ -484,8 +470,7 @@ did_not_drag (GeditFileBrowserView *view,
activate_selected_items (view);
}
else if ((event->button == 1 || event->button == 2) &&
- ((event->state & GDK_CONTROL_MASK) != 0 ||
- (event->state & GDK_SHIFT_MASK) == 0) &&
+ ((event->state & GDK_CONTROL_MASK) != 0 || (event->state & GDK_SHIFT_MASK) == 0) &&
view->priv->selected_on_button_down)
{
if (!button_event_modifies_selection (event))
@@ -525,23 +510,19 @@ static gboolean
button_press_event (GtkWidget *widget,
GdkEventButton *event)
{
+ GtkWidgetClass *widget_parent = GTK_WIDGET_CLASS (gedit_file_browser_view_parent_class);
+ GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+ GeditFileBrowserView *view = GEDIT_FILE_BROWSER_VIEW (widget);
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
int double_click_time;
static int click_count = 0;
static guint32 last_click_time = 0;
- GeditFileBrowserView *view;
- GtkTreeView *tree_view;
- GtkTreeSelection *selection;
GtkTreePath *path;
int expander_size;
int horizontal_separator;
gboolean on_expander;
gboolean call_parent;
gboolean selected;
- GtkWidgetClass *widget_parent = GTK_WIDGET_CLASS (gedit_file_browser_view_parent_class);
-
- tree_view = GTK_TREE_VIEW (widget);
- view = GEDIT_FILE_BROWSER_VIEW (widget);
- selection = gtk_tree_view_get_selection (tree_view);
/* Get double click time */
g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
@@ -566,8 +547,7 @@ button_press_event (GtkWidget *widget,
view->priv->ignore_release = FALSE;
call_parent = TRUE;
- if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y,
- &path, NULL, NULL, NULL))
+ if (gtk_tree_view_get_path_at_pos (tree_view, event->x, event->y, &path, NULL, NULL, NULL))
{
/* Keep track of path of last click so double clicks only happen
* on the same item */
@@ -674,14 +654,9 @@ static gboolean
key_press_event (GtkWidget *widget,
GdkEventKey *event)
{
- GeditFileBrowserView *view;
- guint modifiers;
- gboolean handled;
-
- view = GEDIT_FILE_BROWSER_VIEW (widget);
- handled = FALSE;
-
- modifiers = gtk_accelerator_get_default_mod_mask ();
+ GeditFileBrowserView *view = GEDIT_FILE_BROWSER_VIEW (widget);
+ guint modifiers = gtk_accelerator_get_default_mod_mask ();
+ gboolean handled = FALSE;
switch (event->keyval)
{
@@ -729,7 +704,7 @@ key_press_event (GtkWidget *widget,
static void
fill_expand_state (GeditFileBrowserView *view,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
GtkTreePath *path;
GtkTreeIter child;
@@ -745,8 +720,7 @@ fill_expand_state (GeditFileBrowserView *view,
gtk_tree_model_get (view->priv->model,
iter,
- GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION,
- &location,
+ GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION, &location,
-1);
add_expand_state (view, location);
@@ -771,46 +745,20 @@ static void
uninstall_restore_signals (GeditFileBrowserView *tree_view,
GtkTreeModel *model)
{
- g_signal_handlers_disconnect_by_func (model,
- on_begin_refresh,
- tree_view);
-
- g_signal_handlers_disconnect_by_func (model,
- on_end_refresh,
- tree_view);
-
- g_signal_handlers_disconnect_by_func (model,
- on_unload,
- tree_view);
-
- g_signal_handlers_disconnect_by_func (model,
- on_row_inserted,
- tree_view);
+ g_signal_handlers_disconnect_by_func (model, on_begin_refresh, tree_view);
+ g_signal_handlers_disconnect_by_func (model, on_end_refresh, tree_view);
+ g_signal_handlers_disconnect_by_func (model, on_unload, tree_view);
+ g_signal_handlers_disconnect_by_func (model, on_row_inserted, tree_view);
}
static void
install_restore_signals (GeditFileBrowserView *tree_view,
GtkTreeModel *model)
{
- g_signal_connect (model,
- "begin-refresh",
- G_CALLBACK (on_begin_refresh),
- tree_view);
-
- g_signal_connect (model,
- "end-refresh",
- G_CALLBACK (on_end_refresh),
- tree_view);
-
- g_signal_connect (model,
- "unload",
- G_CALLBACK (on_unload),
- tree_view);
-
- g_signal_connect_after (model,
- "row-inserted",
- G_CALLBACK (on_row_inserted),
- tree_view);
+ g_signal_connect (model, "begin-refresh", G_CALLBACK (on_begin_refresh), tree_view);
+ g_signal_connect (model, "end-refresh", G_CALLBACK (on_end_refresh), tree_view);
+ g_signal_connect (model, "unload", G_CALLBACK (on_unload), tree_view);
+ g_signal_connect_after (model, "row-inserted", G_CALLBACK (on_row_inserted), tree_view);
}
static void
@@ -836,7 +784,6 @@ set_restore_expand_state (GeditFileBrowserView *view,
if (view->priv->model && GEDIT_IS_FILE_BROWSER_STORE (view->priv->model))
{
fill_expand_state (view, NULL);
-
install_restore_signals (view, view->priv->model);
}
}
@@ -977,12 +924,10 @@ cell_data_cb (GtkTreeViewColumn *tree_column,
GtkTreeIter *iter,
GeditFileBrowserView *obj)
{
- GtkTreePath *path;
+ GtkTreePath *path = gtk_tree_model_get_path (tree_model, iter);
PangoUnderline underline = PANGO_UNDERLINE_NONE;
gboolean editable = FALSE;
- path = gtk_tree_model_get_path (tree_model, iter);
-
if (obj->priv->click_policy == GEDIT_FILE_BROWSER_VIEW_CLICK_POLICY_SINGLE &&
obj->priv->hover_path != NULL &&
gtk_tree_path_compare (path, obj->priv->hover_path) == 0)
@@ -994,9 +939,8 @@ cell_data_cb (GtkTreeViewColumn *tree_column,
obj->priv->editable != NULL &&
gtk_tree_row_reference_valid (obj->priv->editable))
{
- GtkTreePath *edpath;
+ GtkTreePath *edpath = gtk_tree_row_reference_get_path (obj->priv->editable);
- edpath = gtk_tree_row_reference_get_path (obj->priv->editable);
editable = edpath && gtk_tree_path_compare (path, edpath) == 0;
gtk_tree_path_free (edpath);
@@ -1051,9 +995,10 @@ bookmarks_separator_func (GtkTreeModel *model,
{
guint flags;
- gtk_tree_model_get (model, iter,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS,
- &flags, -1);
+ gtk_tree_model_get (model,
+ iter,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &flags,
+ -1);
return (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_SEPARATOR);
}
@@ -1062,9 +1007,7 @@ bookmarks_separator_func (GtkTreeModel *model,
GtkWidget *
gedit_file_browser_view_new (void)
{
- GeditFileBrowserView *obj =
- GEDIT_FILE_BROWSER_VIEW (g_object_new
- (GEDIT_TYPE_FILE_BROWSER_VIEW, NULL));
+ GeditFileBrowserView *obj = GEDIT_FILE_BROWSER_VIEW (g_object_new (GEDIT_TYPE_FILE_BROWSER_VIEW,
NULL));
return GTK_WIDGET (obj);
}
@@ -1083,30 +1026,19 @@ gedit_file_browser_view_set_model (GeditFileBrowserView *tree_view,
if (GEDIT_IS_FILE_BOOKMARKS_STORE (model))
{
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
- gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW
- (tree_view),
- bookmarks_separator_func,
- NULL, NULL);
- gtk_tree_view_column_set_cell_data_func (tree_view->priv->
- column,
- tree_view->priv->
- text_renderer,
- (GtkTreeCellDataFunc)
- cell_data_cb,
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (tree_view), bookmarks_separator_func,
NULL, NULL);
+ gtk_tree_view_column_set_cell_data_func (tree_view->priv->column,
+ tree_view->priv->text_renderer,
+ (GtkTreeCellDataFunc)cell_data_cb,
tree_view, NULL);
}
else
{
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
- gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW
- (tree_view), NULL,
- NULL, NULL);
- gtk_tree_view_column_set_cell_data_func (tree_view->priv->
- column,
- tree_view->priv->
- text_renderer,
- (GtkTreeCellDataFunc)
- cell_data_cb,
+ gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (tree_view), NULL, NULL, NULL);
+ gtk_tree_view_column_set_cell_data_func (tree_view->priv->column,
+ tree_view->priv->text_renderer,
+ (GtkTreeCellDataFunc)cell_data_cb,
tree_view, NULL);
if (tree_view->priv->restore_expand_state)
@@ -1120,11 +1052,10 @@ gedit_file_browser_view_set_model (GeditFileBrowserView *tree_view,
tree_view->priv->hover_path = NULL;
}
- if (GEDIT_IS_FILE_BROWSER_STORE (tree_view->priv->model))
+ if (GEDIT_IS_FILE_BROWSER_STORE (tree_view->priv->model) &&
+ tree_view->priv->restore_expand_state)
{
- if (tree_view->priv->restore_expand_state)
- uninstall_restore_signals (tree_view,
- tree_view->priv->model);
+ uninstall_restore_signals (tree_view, tree_view->priv->model);
}
tree_view->priv->model = model;
@@ -1143,11 +1074,11 @@ gedit_file_browser_view_start_rename (GeditFileBrowserView *tree_view,
GtkTreePath *path;
g_return_if_fail (GEDIT_IS_FILE_BROWSER_VIEW (tree_view));
- g_return_if_fail (GEDIT_IS_FILE_BROWSER_STORE
- (tree_view->priv->model));
+ g_return_if_fail (GEDIT_IS_FILE_BROWSER_STORE (tree_view->priv->model));
g_return_if_fail (iter != NULL);
- gtk_tree_model_get (tree_view->priv->model, iter,
+ gtk_tree_model_get (tree_view->priv->model,
+ iter,
GEDIT_FILE_BROWSER_STORE_COLUMN_NAME, &name,
GEDIT_FILE_BROWSER_STORE_COLUMN_MARKUP, &markup,
GEDIT_FILE_BROWSER_STORE_COLUMN_FLAGS, &flags,
@@ -1165,7 +1096,8 @@ gedit_file_browser_view_start_rename (GeditFileBrowserView *tree_view,
*/
g_value_init (&name_escaped, G_TYPE_STRING);
g_value_take_string (&name_escaped, g_markup_escape_text (name, -1));
- gedit_file_browser_store_set_value (GEDIT_FILE_BROWSER_STORE (tree_view->priv->model), iter,
+ gedit_file_browser_store_set_value (GEDIT_FILE_BROWSER_STORE (tree_view->priv->model),
+ iter,
GEDIT_FILE_BROWSER_STORE_COLUMN_MARKUP, &name_escaped);
path = gtk_tree_model_get_path (tree_view->priv->model, iter);
@@ -1175,8 +1107,7 @@ gedit_file_browser_view_start_rename (GeditFileBrowserView *tree_view,
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
if (gtk_tree_path_up (path))
- gtk_tree_view_expand_to_path (GTK_TREE_VIEW (tree_view),
- path);
+ gtk_tree_view_expand_to_path (GTK_TREE_VIEW (tree_view), path);
gtk_tree_path_free (path);
@@ -1184,12 +1115,10 @@ gedit_file_browser_view_start_rename (GeditFileBrowserView *tree_view,
tree_view->priv->editable = rowref;
/* grab focus on the text cell which is editable */
- gtk_tree_view_column_focus_cell (tree_view->priv->column,
- tree_view->priv->text_renderer);
+ gtk_tree_view_column_focus_cell (tree_view->priv->column, tree_view->priv->text_renderer);
path = gtk_tree_row_reference_get_path (tree_view->priv->editable),
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (tree_view), path,
- tree_view->priv->column, TRUE);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (tree_view), path, tree_view->priv->column, TRUE);
gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (tree_view),
path, tree_view->priv->column,
FALSE, 0.0, 0.0);
@@ -1227,13 +1156,12 @@ on_cell_edited (GtkCellRendererText *cell,
gchar *new_text,
GeditFileBrowserView *tree_view)
{
- GtkTreePath *treepath;
+ GtkTreePath *treepath = gtk_tree_path_new_from_string (path);
GtkTreeIter iter;
gboolean ret;
GValue orig_markup = G_VALUE_INIT;
GError *error = NULL;
- treepath = gtk_tree_path_new_from_string (path);
ret = gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_view->priv->model), &iter, treepath);
gtk_tree_path_free (treepath);
@@ -1247,7 +1175,9 @@ on_cell_edited (GtkCellRendererText *cell,
if (new_text != NULL && *new_text != '\0' &&
gedit_file_browser_store_rename (GEDIT_FILE_BROWSER_STORE (tree_view->priv->model),
- &iter, new_text, &error))
+ &iter,
+ new_text,
+ &error))
{
treepath = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_view->priv->model), &iter);
gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (tree_view),
@@ -1257,8 +1187,7 @@ on_cell_edited (GtkCellRendererText *cell,
}
else if (error)
{
- g_signal_emit (tree_view, signals[ERROR], 0,
- error->code, error->message);
+ g_signal_emit (tree_view, signals[ERROR], 0, error->code, error->message);
g_error_free (error);
}
@@ -1311,25 +1240,17 @@ restore_expand_state (GeditFileBrowserView *view,
gtk_tree_model_get (GTK_TREE_MODEL (model),
iter,
- GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION,
- &location,
+ GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION, &location,
-1);
if (location)
{
- GtkTreePath *path;
-
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), iter);
+ GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), iter);
if (g_hash_table_lookup (view->priv->expand_state, location))
- {
- gtk_tree_view_expand_row (GTK_TREE_VIEW (view),
- path,
- FALSE);
- }
+ gtk_tree_view_expand_row (GTK_TREE_VIEW (view), path, FALSE);
gtk_tree_path_free (path);
-
g_object_unref (location);
}
}
diff --git a/plugins/filebrowser/gedit-file-browser-view.h b/plugins/filebrowser/gedit-file-browser-view.h
index 77072319b..8c2efc8a4 100644
--- a/plugins/filebrowser/gedit-file-browser-view.h
+++ b/plugins/filebrowser/gedit-file-browser-view.h
@@ -43,7 +43,7 @@ typedef enum {
struct _GeditFileBrowserView
{
- GtkTreeView parent;
+ GtkTreeView parent;
GeditFileBrowserViewPrivate *priv;
};
diff --git a/plugins/filebrowser/gedit-file-browser-widget.c b/plugins/filebrowser/gedit-file-browser-widget.c
index 611ef713a..bb391e7b6 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.c
+++ b/plugins/filebrowser/gedit-file-browser-widget.c
@@ -83,15 +83,15 @@ static guint signals[NUM_SIGNALS] = { 0 };
typedef struct _SignalNode
{
GObject *object;
- gulong id;
+ gulong id;
} SignalNode;
typedef struct
{
- gulong id;
+ gulong id;
GeditFileBrowserWidgetFilterFunc func;
- gpointer user_data;
- GDestroyNotify destroy_notify;
+ gpointer user_data;
+ GDestroyNotify destroy_notify;
} FilterFunc;
typedef struct
@@ -102,57 +102,57 @@ typedef struct
typedef struct
{
- gchar *name;
+ gchar *name;
GdkPixbuf *icon;
} NameIcon;
struct _GeditFileBrowserWidgetPrivate
{
- GeditFileBrowserView *treeview;
- GeditFileBrowserStore *file_store;
+ GeditFileBrowserView *treeview;
+ GeditFileBrowserStore *file_store;
GeditFileBookmarksStore *bookmarks_store;
- GHashTable *bookmarks_hash;
+ GHashTable *bookmarks_hash;
- GMenuModel *dir_menu;
- GMenuModel *bookmarks_menu;
+ GMenuModel *dir_menu;
+ GMenuModel *bookmarks_menu;
- GtkWidget *previous_button;
- GtkWidget *next_button;
+ GtkWidget *previous_button;
+ GtkWidget *next_button;
- GtkWidget *locations_button;
- GtkWidget *locations_popover;
- GtkWidget *locations_treeview;
- GtkTreeSelection *locations_treeview_selection;
- GtkWidget *locations_button_arrow;
- GtkWidget *locations_cellview;
- GtkListStore *locations_model;
+ GtkWidget *locations_button;
+ GtkWidget *locations_popover;
+ GtkWidget *locations_treeview;
+ GtkTreeSelection *locations_treeview_selection;
+ GtkWidget *locations_button_arrow;
+ GtkWidget *locations_cellview;
+ GtkListStore *locations_model;
- GtkWidget *location_entry;
+ GtkWidget *location_entry;
- GtkWidget *filter_entry_revealer;
- GtkWidget *filter_entry;
+ GtkWidget *filter_entry_revealer;
+ GtkWidget *filter_entry;
- GSimpleActionGroup *action_group;
+ GSimpleActionGroup *action_group;
- GSList *signal_pool;
+ GSList *signal_pool;
- GSList *filter_funcs;
- gulong filter_id;
- gulong glob_filter_id;
- GPatternSpec *filter_pattern;
- gchar *filter_pattern_str;
+ GSList *filter_funcs;
+ gulong filter_id;
+ gulong glob_filter_id;
+ GPatternSpec *filter_pattern;
+ gchar *filter_pattern_str;
- GList *locations;
- GList *current_location;
- gboolean changing_location;
- GtkWidget *location_previous_menu;
- GtkWidget *location_next_menu;
- GtkWidget *current_location_menu_item;
+ GList *locations;
+ GList *current_location;
+ gboolean changing_location;
+ GtkWidget *location_previous_menu;
+ GtkWidget *location_next_menu;
+ GtkWidget *current_location_menu_item;
- GCancellable *cancellable;
+ GCancellable *cancellable;
- GdkCursor *busy_cursor;
+ GdkCursor *busy_cursor;
};
static void on_model_set (GObject *gobject,
@@ -273,13 +273,11 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditFileBrowserWidget,
static void
free_name_icon (gpointer data)
{
- NameIcon *item;
+ NameIcon *item = (NameIcon *)(data);
- if (data == NULL)
+ if (item == NULL)
return;
- item = (NameIcon *)(data);
-
g_free (item->name);
if (item->icon)
@@ -294,9 +292,7 @@ filter_func_new (GeditFileBrowserWidget *obj,
gpointer user_data,
GDestroyNotify notify)
{
- FilterFunc *result;
-
- result = g_slice_new (FilterFunc);
+ FilterFunc *result = g_slice_new (FilterFunc);
result->id = ++obj->priv->filter_id;
result->func = func;
@@ -319,11 +315,11 @@ location_free (Location *loc)
static gboolean
locations_find_by_id (GeditFileBrowserWidget *obj,
- guint id,
- GtkTreeIter *iter)
+ guint id,
+ GtkTreeIter *iter)
{
- guint checkid;
GtkTreeModel *model = GTK_TREE_MODEL (obj->priv->locations_model);
+ guint checkid;
if (iter == NULL)
return FALSE;
@@ -332,8 +328,10 @@ locations_find_by_id (GeditFileBrowserWidget *obj,
{
do
{
- gtk_tree_model_get (model, iter, COLUMN_ID,
- &checkid, -1);
+ gtk_tree_model_get (model,
+ iter,
+ COLUMN_ID, &checkid,
+ -1);
if (checkid == id)
return TRUE;
@@ -375,10 +373,9 @@ gedit_file_browser_widget_finalize (GObject *object)
static void
clear_signals (GeditFileBrowserWidget *obj)
{
- GSList *item;
+ GSList *item = obj->priv->signal_pool;
SignalNode *node;
- item = obj->priv->signal_pool;
while (item != NULL)
{
node = (SignalNode *) (item->data);
@@ -560,12 +557,13 @@ add_signal (GeditFileBrowserWidget *obj,
node->object = G_OBJECT (object);
node->id = id;
- obj->priv->signal_pool =
- g_slist_prepend (obj->priv->signal_pool, node);
+ obj->priv->signal_pool = g_slist_prepend (obj->priv->signal_pool, node);
}
static gboolean
-separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+separator_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
{
guint id;
@@ -580,16 +578,11 @@ get_from_bookmark_file (GeditFileBrowserWidget *obj,
gchar **name,
GdkPixbuf **icon)
{
- gpointer data;
- NameIcon *item;
-
- data = g_hash_table_lookup (obj->priv->bookmarks_hash, file);
+ NameIcon *item = (NameIcon *)g_hash_table_lookup (obj->priv->bookmarks_hash, file);
- if (data == NULL)
+ if (item == NULL)
return FALSE;
- item = (NameIcon *)data;
-
*name = g_strdup (item->name);
if (icon != NULL && item->icon != NULL)
@@ -606,7 +599,7 @@ insert_path_item (GeditFileBrowserWidget *obj,
GtkTreeIter *after,
GtkTreeIter *iter)
{
- gchar *unescape;
+ gchar *unescape = NULL;
GdkPixbuf *icon = NULL;
/* Try to get the icon and name from the bookmarks hash */
@@ -754,11 +747,6 @@ fill_locations_model (GeditFileBrowserWidget *obj)
COLUMN_NAME, _("Bookmarks"),
COLUMN_ID, BOOKMARKS_ID, -1);
- if (icon != NULL)
- {
- g_object_unref (icon);
- }
-
gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (priv->locations_treeview),
separator_func,
obj,
@@ -776,11 +764,10 @@ filter_real (GeditFileBrowserStore *model,
GeditFileBrowserWidget *obj)
{
GSList *item;
- FilterFunc *func;
for (item = obj->priv->filter_funcs; item; item = item->next)
{
- func = (FilterFunc *) (item->data);
+ FilterFunc *func = (FilterFunc *)(item->data);
if (!func->func (obj, model, iter, func->user_data))
return FALSE;
@@ -791,28 +778,22 @@ filter_real (GeditFileBrowserStore *model,
static void
add_bookmark_hash (GeditFileBrowserWidget *obj,
- GtkTreeIter *iter)
+ GtkTreeIter *iter)
{
- GtkTreeModel *model;
+ GtkTreeModel *model = GTK_TREE_MODEL (obj->priv->bookmarks_store);
GdkPixbuf *pixbuf;
gchar *name;
GFile *location;
NameIcon *item;
- model = GTK_TREE_MODEL (obj->priv->bookmarks_store);
-
- location = gedit_file_bookmarks_store_get_location (obj->priv->
- bookmarks_store,
- iter);
-
- if (location == NULL)
+ if (!(location = gedit_file_bookmarks_store_get_location (obj->priv->bookmarks_store, iter)))
return;
- gtk_tree_model_get (model, iter,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_ICON,
- &pixbuf,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_NAME,
- &name, -1);
+ gtk_tree_model_get (model,
+ iter,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_ICON, &pixbuf,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_NAME, &name,
+ -1);
item = g_slice_new (NameIcon);
item->name = name;
@@ -826,10 +807,8 @@ add_bookmark_hash (GeditFileBrowserWidget *obj,
static void
init_bookmarks_hash (GeditFileBrowserWidget *obj)
{
+ GtkTreeModel *model = GTK_TREE_MODEL (obj->priv->bookmarks_store);
GtkTreeIter iter;
- GtkTreeModel *model;
-
- model = GTK_TREE_MODEL (obj->priv->bookmarks_store);
if (!gtk_tree_model_get_iter_first (model, &iter))
return;
@@ -898,8 +877,7 @@ on_locations_treeview_row_activated (GtkTreeView *locations_treeview,
{
gtk_tree_model_get (GTK_TREE_MODEL (priv->locations_model),
&iter,
- COLUMN_FILE,
- &file,
+ COLUMN_FILE, &file,
-1);
gedit_file_browser_store_set_virtual_root_from_location (priv->file_store, file);
@@ -943,9 +921,9 @@ gedit_file_browser_widget_init (GeditFileBrowserWidget *obj)
obj->priv->filter_pattern_str = g_strdup ("");
obj->priv->bookmarks_hash = g_hash_table_new_full (g_file_hash,
- (GEqualFunc)g_file_equal,
- g_object_unref,
- free_name_icon);
+ (GEqualFunc)g_file_equal,
+ g_object_unref,
+ free_name_icon);
display = gtk_widget_get_display (GTK_WIDGET (obj));
obj->priv->busy_cursor = gdk_cursor_new_from_name (display, "progress");
@@ -1226,66 +1204,49 @@ filter_glob (GeditFileBrowserWidget *obj,
-1);
if (FILE_IS_DIR (flags) || FILE_IS_DUMMY (flags))
- {
result = TRUE;
- }
else
- {
- result = g_pattern_match_string (obj->priv->filter_pattern,
- name);
- }
+ result = g_pattern_match_string (obj->priv->filter_pattern, name);
g_free (name);
-
return result;
}
static void
rename_selected_file (GeditFileBrowserWidget *obj)
{
- GtkTreeModel *model;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
GtkTreeIter iter;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
-
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return;
if (gedit_file_browser_widget_get_first_selected (obj, &iter))
- {
- gedit_file_browser_view_start_rename (obj->priv->treeview,
- &iter);
- }
+ gedit_file_browser_view_start_rename (obj->priv->treeview, &iter);
}
static GList *
get_deletable_files (GeditFileBrowserWidget *obj)
{
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GList *rows;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (obj->priv->treeview));
+ GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
GList *row;
GList *paths = NULL;
- guint flags;
- GtkTreeIter iter;
- GtkTreePath *path;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
-
- /* Get all selected files */
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (obj->priv->treeview));
- rows = gtk_tree_selection_get_selected_rows (selection, &model);
for (row = rows; row; row = row->next)
{
- path = (GtkTreePath *)(row->data);
+ GtkTreePath *path = (GtkTreePath *)(row->data);
+ GtkTreeIter iter;
+ guint flags;
if (!gtk_tree_model_get_iter (model, &iter, path))
continue;
- gtk_tree_model_get (model, &iter,
- GEDIT_FILE_BROWSER_STORE_COLUMN_FLAGS,
- &flags, -1);
+ gtk_tree_model_get (model,
+ &iter,
+ GEDIT_FILE_BROWSER_STORE_COLUMN_FLAGS, &flags,
+ -1);
if (FILE_IS_DUMMY (flags))
continue;
@@ -1302,19 +1263,15 @@ static gboolean
delete_selected_files (GeditFileBrowserWidget *obj,
gboolean trash)
{
- GtkTreeModel *model;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
gboolean confirm;
GeditFileBrowserStoreResult result;
GList *rows;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
-
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return FALSE;
- rows = get_deletable_files (obj);
-
- if (!rows)
+ if (!(rows = get_deletable_files (obj)))
return FALSE;
if (!trash)
@@ -1326,7 +1283,8 @@ delete_selected_files (GeditFileBrowserWidget *obj,
}
result = gedit_file_browser_store_delete_all (GEDIT_FILE_BROWSER_STORE (model),
- rows, trash);
+ rows,
+ trash);
g_list_free_full (rows, (GDestroyNotify) gtk_tree_path_free);
@@ -1347,8 +1305,7 @@ show_location_entry (GeditFileBrowserWidget *obj,
/* grab_focus() causes the entry's text to become
* selected so, unselect it and move the cursor to the end.
*/
- gtk_editable_set_position (GTK_EDITABLE (obj->priv->location_entry),
- -1);
+ gtk_editable_set_position (GTK_EDITABLE (obj->priv->location_entry), -1);
}
static gboolean
@@ -1366,10 +1323,8 @@ on_file_store_no_trash (GeditFileBrowserStore *store,
static GFile *
get_topmost_file (GFile *file)
{
+ GFile *current = g_object_ref (file);
GFile *tmp;
- GFile *current;
-
- current = g_object_ref (file);
while ((tmp = g_file_get_parent (current)) != NULL)
{
@@ -1384,16 +1339,11 @@ static GtkWidget *
create_goto_menu_item (GeditFileBrowserWidget *obj,
GList *item)
{
+ Location *loc = (Location *) (item->data);
GtkWidget *result;
- gchar *unescape;
- Location *loc;
+ gchar *unescape = NULL;
- loc = (Location *) (item->data);
-
- if (!get_from_bookmark_file (obj, loc->virtual_root, &unescape, NULL))
- {
unescape = gedit_file_browser_utils_file_basename (loc->virtual_root);
- }
result = gtk_menu_item_new_with_label (unescape);
@@ -1467,9 +1417,7 @@ jump_to_location (GeditFileBrowserWidget *obj,
if (widget)
{
/* Prepend the menu item to the menu */
- gtk_menu_shell_prepend (GTK_MENU_SHELL (menu_to),
- widget);
-
+ gtk_menu_shell_prepend (GTK_MENU_SHELL (menu_to), widget);
g_object_unref (widget);
}
@@ -1490,8 +1438,7 @@ jump_to_location (GeditFileBrowserWidget *obj,
}
else
{
- obj->priv->current_location =
- iter_func (obj->priv->current_location);
+ obj->priv->current_location = iter_func (obj->priv->current_location);
}
child = child->next;
@@ -1524,13 +1471,11 @@ clear_next_locations (GeditFileBrowserWidget *obj)
while (obj->priv->current_location->prev)
{
location_free ((Location *) (obj->priv->current_location->prev->data));
- obj->priv->locations =
- g_list_remove_link (obj->priv->locations,
- obj->priv->current_location->prev);
+ obj->priv->locations = g_list_remove_link (obj->priv->locations,
+ obj->priv->current_location->prev);
}
- children = gtk_container_get_children (GTK_CONTAINER
- (obj->priv->location_next_menu));
+ children = gtk_container_get_children (GTK_CONTAINER (obj->priv->location_next_menu));
for (item = children; item; item = item->next)
{
@@ -1541,8 +1486,7 @@ clear_next_locations (GeditFileBrowserWidget *obj)
g_list_free (children);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "next_location");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "next_location");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE);
}
@@ -1563,8 +1507,7 @@ update_filter_mode (GeditFileBrowserWidget *obj,
else
now |= mode;
- gedit_file_browser_store_set_filter_mode (GEDIT_FILE_BROWSER_STORE (model),
- now);
+ gedit_file_browser_store_set_filter_mode (GEDIT_FILE_BROWSER_STORE (model), now);
}
@@ -1576,9 +1519,7 @@ set_filter_pattern_real (GeditFileBrowserWidget *obj,
gchar const *pattern,
gboolean update_entry)
{
- GtkTreeModel *model;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
if (pattern != NULL && *pattern == '\0')
pattern = NULL;
@@ -1587,21 +1528,15 @@ set_filter_pattern_real (GeditFileBrowserWidget *obj,
return;
if (pattern != NULL && strcmp (pattern, obj->priv->filter_pattern_str) == 0)
- {
return;
- }
/* Free the old pattern */
g_free (obj->priv->filter_pattern_str);
if (pattern == NULL)
- {
obj->priv->filter_pattern_str = g_strdup ("");
- }
else
- {
obj->priv->filter_pattern_str = g_strdup (pattern);
- }
if (obj->priv->filter_pattern)
{
@@ -1613,8 +1548,7 @@ set_filter_pattern_real (GeditFileBrowserWidget *obj,
{
if (obj->priv->glob_filter_id != 0)
{
- gedit_file_browser_widget_remove_filter (obj,
- obj->priv->glob_filter_id);
+ gedit_file_browser_widget_remove_filter (obj, obj->priv->glob_filter_id);
obj->priv->glob_filter_id = 0;
}
}
@@ -1623,25 +1557,17 @@ set_filter_pattern_real (GeditFileBrowserWidget *obj,
obj->priv->filter_pattern = g_pattern_spec_new (pattern);
if (obj->priv->glob_filter_id == 0)
- {
- obj->priv->glob_filter_id =
- gedit_file_browser_widget_add_filter (obj,
- filter_glob,
- NULL,
- NULL);
- }
+ obj->priv->glob_filter_id = gedit_file_browser_widget_add_filter (obj,
+ filter_glob,
+ NULL,
+ NULL);
}
if (update_entry)
- {
- gtk_entry_set_text (GTK_ENTRY (obj->priv->filter_entry),
- obj->priv->filter_pattern_str);
- }
+ gtk_entry_set_text (GTK_ENTRY (obj->priv->filter_entry), obj->priv->filter_pattern_str);
if (GEDIT_IS_FILE_BROWSER_STORE (model))
- {
gedit_file_browser_store_refilter (GEDIT_FILE_BROWSER_STORE (model));
- }
g_object_notify (G_OBJECT (obj), "filter-pattern");
}
@@ -1705,15 +1631,13 @@ gedit_file_browser_widget_set_root_and_virtual_root (GeditFileBrowserWidget *obj
GeditFileBrowserStoreResult result;
if (!virtual_root)
- {
- result = gedit_file_browser_store_set_root_and_virtual_root
- (obj->priv->file_store, root, root);
- }
+ result = gedit_file_browser_store_set_root_and_virtual_root (obj->priv->file_store,
+ root,
+ root);
else
- {
- result = gedit_file_browser_store_set_root_and_virtual_root
- (obj->priv->file_store, root, virtual_root);
- }
+ result = gedit_file_browser_store_set_root_and_virtual_root (obj->priv->file_store,
+ root,
+ virtual_root);
if (result == GEDIT_FILE_BROWSER_STORE_RESULT_NO_CHANGE)
show_files_real (obj, TRUE);
@@ -1738,9 +1662,7 @@ gedit_file_browser_widget_set_root (GeditFileBrowserWidget *obj,
return;
parent = get_topmost_file (root);
-
gedit_file_browser_widget_set_root_and_virtual_root (obj, parent, root);
-
g_object_unref (parent);
}
@@ -1790,20 +1712,17 @@ gedit_file_browser_widget_remove_filter (GeditFileBrowserWidget *obj,
gulong id)
{
GSList *item;
- FilterFunc *func;
for (item = obj->priv->filter_funcs; item; item = item->next)
{
- func = (FilterFunc *) (item->data);
+ FilterFunc *func = (FilterFunc *) (item->data);
if (func->id == id)
{
if (func->destroy_notify)
func->destroy_notify (func->user_data);
- obj->priv->filter_funcs =
- g_slist_remove_link (obj->priv->filter_funcs,
- item);
+ obj->priv->filter_funcs = g_slist_remove_link (obj->priv->filter_funcs, item);
filter_func_free (func);
break;
@@ -1820,8 +1739,7 @@ gedit_file_browser_widget_set_filter_pattern (GeditFileBrowserWidget *obj,
/* if pattern is not null, reveal the entry */
show = pattern != NULL && *pattern != '\0';
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "show_match_filename");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "show_match_filename");
g_action_change_state (action, g_variant_new_boolean (show));
set_filter_pattern_real (obj, pattern, TRUE);
@@ -1867,8 +1785,7 @@ gedit_file_browser_widget_set_active_root_enabled (GeditFileBrowserWidget *widge
g_return_if_fail (GEDIT_IS_FILE_BROWSER_WIDGET (widget));
- action = g_action_map_lookup_action (G_ACTION_MAP (widget->priv->action_group),
- "set_active_root");
+ action = g_action_map_lookup_action (G_ACTION_MAP (widget->priv->action_group), "set_active_root");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), enabled);
}
@@ -1877,16 +1794,10 @@ gedit_file_browser_widget_get_num_selected_files_or_directories (GeditFileBrowse
guint *files,
guint *dirs)
{
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (obj->priv->treeview));
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
GList *rows, *row;
- GtkTreePath *path;
- GtkTreeIter iter;
- GeditFileBrowserStoreFlag flags;
guint result = 0;
- GtkTreeSelection *selection;
- GtkTreeModel *model;
-
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (obj->priv->treeview));
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
if (GEDIT_IS_FILE_BOOKMARKS_STORE (model))
return 0;
@@ -1895,7 +1806,9 @@ gedit_file_browser_widget_get_num_selected_files_or_directories (GeditFileBrowse
for (row = rows; row; row = row->next)
{
- path = (GtkTreePath *)(row->data);
+ GtkTreePath *path = (GtkTreePath *)(row->data);
+ GeditFileBrowserStoreFlag flags;
+ GtkTreeIter iter;
/* Get iter from path */
if (!gtk_tree_model_get_iter (model, &iter, path))
@@ -1924,15 +1837,14 @@ gedit_file_browser_widget_get_num_selected_files_or_directories (GeditFileBrowse
typedef struct
{
GeditFileBrowserWidget *widget;
- GCancellable *cancellable;
+ GCancellable *cancellable;
} AsyncData;
static AsyncData *
async_data_new (GeditFileBrowserWidget *widget)
{
- AsyncData *ret;
+ AsyncData *ret = g_slice_new (AsyncData);
- ret = g_slice_new (AsyncData);
ret->widget = widget;
cancel_async_operation (widget);
@@ -1954,20 +1866,16 @@ static void
set_busy (GeditFileBrowserWidget *obj,
gboolean busy)
{
- GdkWindow *window;
-
- window = gtk_widget_get_window (GTK_WIDGET (obj->priv->treeview));
+ GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (obj->priv->treeview));
if (!GDK_IS_WINDOW (window))
return;
if (busy)
{
- GdkDisplay *display;
- GdkCursor *cursor;
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (obj));
+ GdkCursor *cursor= gdk_cursor_new_from_name (display, "progress");
- display = gtk_widget_get_display (GTK_WIDGET (obj));
- cursor = gdk_cursor_new_from_name (display, "progress");
gdk_window_set_cursor (window, cursor);
g_clear_object (&cursor);
}
@@ -1988,11 +1896,8 @@ activate_mount (GeditFileBrowserWidget *widget,
if (!mount)
{
- gchar *message;
- gchar *name;
-
- name = g_volume_get_name (volume);
- message = g_strdup_printf (_("No mount object for mounted volume: %s"), name);
+ gchar *name = g_volume_get_name (volume);
+ gchar *message = g_strdup_printf (_("No mount object for mounted volume: %s"), name);
g_signal_emit (widget,
signals[ERROR],
@@ -2016,14 +1921,9 @@ static void
try_activate_drive (GeditFileBrowserWidget *widget,
GDrive *drive)
{
- GList *volumes;
- GVolume *volume;
- GMount *mount;
-
- volumes = g_drive_get_volumes (drive);
-
- volume = G_VOLUME (volumes->data);
- mount = g_volume_get_mount (volume);
+ GList *volumes = g_drive_get_volumes (drive);
+ GVolume *volume = G_VOLUME (volumes->data);
+ GMount *mount = g_volume_get_mount (volume);
if (mount)
{
@@ -2065,11 +1965,8 @@ poll_for_media_cb (GDrive *drive,
}
else
{
- gchar *message;
- gchar *name;
-
- name = g_drive_get_name (drive);
- message = g_strdup_printf (_("Could not open media: %s"), name);
+ gchar *name = g_drive_get_name (drive);
+ gchar *message = g_strdup_printf (_("Could not open media: %s"), name);
g_signal_emit (async->widget,
signals[ERROR],
@@ -2102,9 +1999,8 @@ mount_volume_cb (GVolume *volume,
if (g_volume_mount_finish (volume, res, &error))
{
- GMount *mount;
+ GMount *mount = g_volume_get_mount (volume);
- mount = g_volume_get_mount (volume);
activate_mount (async->widget, volume, mount);
if (mount)
@@ -2112,11 +2008,8 @@ mount_volume_cb (GVolume *volume,
}
else
{
- gchar *message;
- gchar *name;
-
- name = g_volume_get_name (volume);
- message = g_strdup_printf (_("Could not mount volume: %s"), name);
+ gchar *name = g_volume_get_name (volume);
+ gchar *message = g_strdup_printf (_("Could not mount volume: %s"), name);
g_signal_emit (async->widget,
signals[ERROR],
@@ -2141,9 +2034,10 @@ activate_drive (GeditFileBrowserWidget *obj,
GDrive *drive;
AsyncData *async;
- gtk_tree_model_get (GTK_TREE_MODEL (obj->priv->bookmarks_store), iter,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT,
- &drive, -1);
+ gtk_tree_model_get (GTK_TREE_MODEL (obj->priv->bookmarks_store),
+ iter,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT, &drive,
+ -1);
/* most common use case is a floppy drive, we'll poll for media and
go from there */
@@ -2161,11 +2055,8 @@ static void
try_mount_volume (GeditFileBrowserWidget *widget,
GVolume *volume)
{
- GMountOperation *operation;
- AsyncData *async;
-
- operation = gtk_mount_operation_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (widget))));
- async = async_data_new (widget);
+ GMountOperation *operation = gtk_mount_operation_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET
(widget))));
+ AsyncData *async = async_data_new (widget);
g_volume_mount (volume,
G_MOUNT_MOUNT_NONE,
@@ -2184,9 +2075,10 @@ activate_volume (GeditFileBrowserWidget *obj,
{
GVolume *volume;
- gtk_tree_model_get (GTK_TREE_MODEL (obj->priv->bookmarks_store), iter,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT,
- &volume, -1);
+ gtk_tree_model_get (GTK_TREE_MODEL (obj->priv->bookmarks_store),
+ iter,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_OBJECT, &volume,
+ -1);
/* see if we can mount the volume */
try_mount_volume (obj, volume);
@@ -2196,28 +2088,25 @@ activate_volume (GeditFileBrowserWidget *obj,
void
gedit_file_browser_widget_refresh (GeditFileBrowserWidget *obj)
{
- GtkTreeModel *model =
- gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
if (GEDIT_IS_FILE_BROWSER_STORE (model))
{
- gedit_file_browser_store_refresh (GEDIT_FILE_BROWSER_STORE
- (model));
+ gedit_file_browser_store_refresh (GEDIT_FILE_BROWSER_STORE (model));
}
else if (GEDIT_IS_FILE_BOOKMARKS_STORE (model))
{
g_hash_table_ref (obj->priv->bookmarks_hash);
g_hash_table_destroy (obj->priv->bookmarks_hash);
- gedit_file_bookmarks_store_refresh
- (GEDIT_FILE_BOOKMARKS_STORE (model));
+ gedit_file_bookmarks_store_refresh (GEDIT_FILE_BOOKMARKS_STORE (model));
}
}
GeditMenuExtension *
gedit_file_browser_widget_extend_context_menu (GeditFileBrowserWidget *obj)
{
- gint i, n_items;
+ guint i, n_items;
GMenuModel *section = NULL;
g_return_val_if_fail (GEDIT_IS_FILE_BROWSER_WIDGET (obj), NULL);
@@ -2246,15 +2135,9 @@ gedit_file_browser_widget_history_back (GeditFileBrowserWidget *obj)
if (obj->priv->locations)
{
if (obj->priv->current_location)
- {
- jump_to_location (obj,
- obj->priv->current_location->next,
- TRUE);
- }
+ jump_to_location (obj, obj->priv->current_location->next, TRUE);
else
- {
jump_to_location (obj, obj->priv->locations, TRUE);
- }
}
}
@@ -2262,10 +2145,7 @@ void
gedit_file_browser_widget_history_forward (GeditFileBrowserWidget *obj)
{
if (obj->priv->locations)
- {
- jump_to_location (obj, obj->priv->current_location->prev,
- FALSE);
- }
+ jump_to_location (obj, obj->priv->current_location->prev, FALSE);
}
static void
@@ -2276,9 +2156,10 @@ bookmark_open (GeditFileBrowserWidget *obj,
GFile *location;
gint flags;
- gtk_tree_model_get (model, iter,
- GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS,
- &flags, -1);
+ gtk_tree_model_get (model,
+ iter,
+ GEDIT_FILE_BOOKMARKS_STORE_COLUMN_FLAGS, &flags,
+ -1);
if (flags & GEDIT_FILE_BOOKMARKS_STORE_IS_DRIVE)
{
@@ -2295,10 +2176,7 @@ bookmark_open (GeditFileBrowserWidget *obj,
return;
}
- location = gedit_file_bookmarks_store_get_location
- (GEDIT_FILE_BOOKMARKS_STORE (model), iter);
-
- if (location)
+ if ((location = gedit_file_bookmarks_store_get_location (GEDIT_FILE_BOOKMARKS_STORE (model), iter)))
{
/* here we check if the bookmark is a mount point, or if it
is a remote bookmark. If that's the case, we will set the
@@ -2308,15 +2186,11 @@ bookmark_open (GeditFileBrowserWidget *obj,
if ((flags & GEDIT_FILE_BOOKMARKS_STORE_IS_MOUNT) ||
(flags & GEDIT_FILE_BOOKMARKS_STORE_IS_REMOTE_BOOKMARK))
{
- gedit_file_browser_widget_set_root (obj,
- location,
- FALSE);
+ gedit_file_browser_widget_set_root (obj, location, FALSE);
}
else
{
- gedit_file_browser_widget_set_root (obj,
- location,
- TRUE);
+ gedit_file_browser_widget_set_root (obj, location, TRUE);
}
g_object_unref (location);
@@ -2328,9 +2202,9 @@ bookmark_open (GeditFileBrowserWidget *obj,
}
static void
-file_open (GeditFileBrowserWidget *obj,
- GtkTreeModel *model,
- GtkTreeIter *iter)
+file_open (GeditFileBrowserWidget *obj,
+ GtkTreeModel *model,
+ GtkTreeIter *iter)
{
GFile *location;
gint flags;
@@ -2364,11 +2238,9 @@ directory_open (GeditFileBrowserWidget *obj,
if (FILE_IS_DIR (flags) && location)
{
- gchar *uri;
+ gchar *uri = g_file_get_uri (location);
result = TRUE;
- uri = g_file_get_uri (location);
-
if (!gtk_show_uri_on_window (GTK_WINDOW (obj), uri, GDK_CURRENT_TIME, &error))
{
g_signal_emit (obj, signals[ERROR], 0,
@@ -2440,9 +2312,10 @@ on_virtual_root_changed (GeditFileBrowserStore *model,
GFile *location;
GtkTreeIter root;
- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
- GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION,
- &location, -1);
+ gtk_tree_model_get (GTK_TREE_MODEL (model),
+ &iter,
+ GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION, &location,
+ -1);
if (gedit_file_browser_store_get_iter_root (model, &root))
{
@@ -2464,38 +2337,28 @@ on_virtual_root_changed (GeditFileBrowserStore *model,
{
/* Add current location to the menu so we can go back
to it later */
- gtk_menu_shell_prepend
- (GTK_MENU_SHELL
- (obj->priv->location_previous_menu),
- obj->priv->current_location_menu_item);
+ gtk_menu_shell_prepend (GTK_MENU_SHELL
(obj->priv->location_previous_menu),
+ obj->priv->current_location_menu_item);
}
- obj->priv->locations =
- g_list_prepend (obj->priv->locations,
- loc);
+ obj->priv->locations = g_list_prepend (obj->priv->locations, loc);
- obj->priv->current_location =
- obj->priv->locations;
- obj->priv->current_location_menu_item =
- create_goto_menu_item (obj,
- obj->priv->current_location);
+ obj->priv->current_location = obj->priv->locations;
+ obj->priv->current_location_menu_item = create_goto_menu_item (obj,
+
obj->priv->current_location);
g_object_ref_sink (obj->priv->current_location_menu_item);
}
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "up");
- g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
- !virtual_root_is_root (obj, model));
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "up");
+ g_simple_action_set_enabled (G_SIMPLE_ACTION (action), !virtual_root_is_root (obj,
model));
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "previous_location");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
"previous_location");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
obj->priv->current_location != NULL &&
obj->priv->current_location->next != NULL);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "next_location");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
"next_location");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
obj->priv->current_location != NULL &&
obj->priv->current_location->prev != NULL);
@@ -2513,8 +2376,9 @@ on_virtual_root_changed (GeditFileBrowserStore *model,
}
static void
-on_model_set (GObject *gobject, GParamSpec *arg1,
- GeditFileBrowserWidget *obj)
+on_model_set (GObject *gobject,
+ GParamSpec *arg1,
+ GeditFileBrowserWidget *obj)
{
GtkTreeModel *model;
@@ -2538,14 +2402,14 @@ on_model_set (GObject *gobject, GParamSpec *arg1,
obj->priv->current_location = NULL;
obj->priv->current_location_menu_item = NULL;
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "previous_location");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
"previous_location");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), TRUE);
}
gtk_widget_hide (obj->priv->filter_entry_revealer);
- add_signal (obj, gobject,
+ add_signal (obj,
+ gobject,
g_signal_connect (gobject, "bookmark-activated",
G_CALLBACK (on_bookmark_activated),
obj));
@@ -2555,12 +2419,14 @@ on_model_set (GObject *gobject, GParamSpec *arg1,
/* make sure any async operation is cancelled */
cancel_async_operation (obj);
- add_signal (obj, gobject,
+ add_signal (obj,
+ gobject,
g_signal_connect (gobject, "file-activated",
G_CALLBACK (on_file_activated),
obj));
- add_signal (obj, model,
+ add_signal (obj,
+ model,
g_signal_connect (model, "no-trash",
G_CALLBACK (on_file_store_no_trash),
obj));
@@ -2612,8 +2478,7 @@ menu_position_func (GtkMenu *menu,
* so the WM can omit the top side of the shadows.
*/
toplevel = gtk_widget_get_toplevel (popup);
- gtk_window_set_type_hint (GTK_WINDOW (toplevel),
- GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU);
+ gtk_window_set_type_hint (GTK_WINDOW (toplevel), GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU);
gtk_widget_get_preferred_size (popup, &menu_req, NULL);
@@ -2625,9 +2490,7 @@ menu_position_func (GtkMenu *menu,
monitor_num = gdk_screen_get_monitor_at_window (screen, window);
if (monitor_num < 0)
- {
monitor_num = 0;
- }
gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
@@ -2640,9 +2503,7 @@ menu_position_func (GtkMenu *menu,
/* treat the default align value like START */
if (align == GTK_ALIGN_FILL)
- {
align = GTK_ALIGN_START;
- }
if (align == GTK_ALIGN_CENTER)
{
@@ -2659,21 +2520,13 @@ menu_position_func (GtkMenu *menu,
}
if ((*y + arrow_allocation.height + menu_req.height) <= monitor.y + monitor.height)
- {
*y += arrow_allocation.height;
- }
else if ((*y - menu_req.height) >= monitor.y)
- {
*y -= menu_req.height;
- }
else if (monitor.y + monitor.height - (*y + arrow_allocation.height) > *y)
- {
*y += arrow_allocation.height;
- }
else
- {
*y -= menu_req.height;
- }
*push_in = FALSE;
}
@@ -2686,18 +2539,12 @@ on_location_button_press_event (GtkWidget *button,
GtkWidget *menu;
if (event->button != GDK_BUTTON_SECONDARY)
- {
return FALSE;
- }
if (button == obj->priv->previous_button)
- {
menu = obj->priv->location_previous_menu;
- }
else
- {
menu = obj->priv->location_next_menu;
- }
gtk_menu_popup_for_device (GTK_MENU (menu), event->device, NULL, NULL,
(GtkMenuPositionFunc) menu_position_func,
@@ -2711,16 +2558,12 @@ on_locations_treeview_selection_changed (GtkTreeSelection *treeview_select
GeditFileBrowserWidget *obj)
{
GeditFileBrowserWidgetPrivate *priv = obj->priv;
- GtkTreeModel *model;
+ GtkTreeModel *model = GTK_TREE_MODEL (priv->locations_model);
GtkTreePath *path;
GtkTreeIter iter;
- model = GTK_TREE_MODEL (priv->locations_model);
-
if (!gtk_tree_selection_get_selected (treeview_selection, &model, &iter))
- {
return;
- }
path = gtk_tree_model_get_path (GTK_TREE_MODEL (obj->priv->locations_model), &iter);
gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (obj->priv->locations_cellview), path);
@@ -2731,20 +2574,16 @@ static void
on_location_entry_activate (GtkEntry *entry,
GeditFileBrowserWidget *obj)
{
- gchar *location;
+ gchar *location = g_strdup (gtk_entry_get_text (entry));
GFile *root;
gchar *cwd;
GFile *new_root;
- location = g_strdup (gtk_entry_get_text (entry));
-
if (g_str_has_prefix (location, "~/"))
{
gchar *tmp = location;
- location = g_strdup_printf ("%s/%s",
- g_get_home_dir (),
- tmp + strlen ("~/"));
+ location = g_strdup_printf ("%s/%s", g_get_home_dir (), tmp + strlen ("~/"));
g_free (tmp);
}
@@ -2753,26 +2592,16 @@ on_location_entry_activate (GtkEntry *entry,
cwd = g_file_get_path (root);
if (cwd == NULL)
- {
cwd = g_file_get_uri (root);
- }
new_root = g_file_new_for_commandline_arg_and_cwd (location, cwd);
- if (g_file_query_file_type (new_root,
- G_FILE_QUERY_INFO_NONE,
- NULL) != G_FILE_TYPE_DIRECTORY)
+ if (g_file_query_file_type (new_root, G_FILE_QUERY_INFO_NONE, NULL) != G_FILE_TYPE_DIRECTORY)
{
- gchar *display_name, *msg;
-
- display_name = g_file_get_parse_name (new_root);
- msg = g_strdup_printf (_("Error when loading “%s”: "
- "No such directory"),
- display_name);
+ gchar *display_name = g_file_get_parse_name (new_root);
+ gchar *msg = g_strdup_printf (_("Error when loading “%s”: No such directory"), display_name);
- g_signal_emit (obj, signals[ERROR], 0,
- GEDIT_FILE_BROWSER_ERROR_LOAD_DIRECTORY,
- msg);
+ g_signal_emit (obj, signals[ERROR], 0, GEDIT_FILE_BROWSER_ERROR_LOAD_DIRECTORY, msg);
g_free (msg);
g_free (display_name);
@@ -2805,9 +2634,7 @@ on_location_entry_key_press_event (GtkWidget *entry,
GdkEventKey *event,
GeditFileBrowserWidget *obj)
{
- guint modifiers;
-
- modifiers = gtk_accelerator_get_default_mod_mask ();
+ guint modifiers = gtk_accelerator_get_default_mod_mask ();
if (event->keyval == GDK_KEY_Escape &&
(event->state & modifiers) == 0)
@@ -2833,7 +2660,8 @@ on_treeview_button_press_event (GeditFileBrowserView *treeview,
GeditFileBrowserWidget *obj)
{
if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_SECONDARY)
- return popup_menu (obj, event,
+ return popup_menu (obj,
+ event,
gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)));
return FALSE;
@@ -2849,11 +2677,10 @@ do_change_directory (GeditFileBrowserWidget *obj,
(~GDK_CONTROL_MASK & ~GDK_SHIFT_MASK & ~GDK_MOD1_MASK)) ==
event->state && event->keyval == GDK_KEY_BackSpace)
{
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "previous_location");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
"previous_location");
}
else if (!((event->state & GDK_MOD1_MASK) &&
- (event->state & (~GDK_CONTROL_MASK & ~GDK_SHIFT_MASK)) == event->state))
+ (event->state & (~GDK_CONTROL_MASK & ~GDK_SHIFT_MASK)) == event->state))
{
return FALSE;
}
@@ -2861,20 +2688,16 @@ do_change_directory (GeditFileBrowserWidget *obj,
switch (event->keyval)
{
case GDK_KEY_Home:
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "home");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "home");
break;
case GDK_KEY_Left:
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "previous_location");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
"previous_location");
break;
case GDK_KEY_Right:
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "next_location");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
"next_location");
break;
case GDK_KEY_Up:
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "up");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "up");
break;
default:
break;
@@ -2898,15 +2721,11 @@ on_treeview_key_press_event (GeditFileBrowserView *treeview,
guint modifiers;
if (do_change_directory (obj, event))
- {
return TRUE;
- }
model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
- {
return FALSE;
- }
modifiers = gtk_accelerator_get_default_mod_mask ();
@@ -2961,57 +2780,41 @@ static void
on_selection_changed (GtkTreeSelection *selection,
GeditFileBrowserWidget *obj)
{
- GtkTreeModel *model;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
GAction *action;
guint selected = 0;
guint files = 0;
guint dirs = 0;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj->priv->treeview));
-
if (GEDIT_IS_FILE_BROWSER_STORE (model))
- {
- selected = gedit_file_browser_widget_get_num_selected_files_or_directories (obj,
- &files,
- &dirs);
- }
+ selected = gedit_file_browser_widget_get_num_selected_files_or_directories (obj, &files,
&dirs);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "move_to_trash");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "move_to_trash");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selected > 0);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "delete");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "delete");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selected > 0);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "open");
- g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
- (selected > 0) && (selected == files));
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "open");
+ g_simple_action_set_enabled (G_SIMPLE_ACTION (action), (selected > 0) && (selected == files));
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "rename");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "rename");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selected == 1);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "open_in_terminal");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "open_in_terminal");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selected == 1);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "new_folder");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "new_folder");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selected <= 1);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "new_file");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "new_file");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), selected <= 1);
}
static gboolean
on_entry_filter_activate (GeditFileBrowserWidget *obj)
{
- gchar const *text;
-
- text = gtk_entry_get_text (GTK_ENTRY (obj->priv->filter_entry));
+ gchar const *text = gtk_entry_get_text (GTK_ENTRY (obj->priv->filter_entry));
set_filter_pattern_real (obj, text, FALSE);
return FALSE;
@@ -3021,17 +2824,13 @@ static void
on_location_jump_activate (GtkMenuItem *item,
GeditFileBrowserWidget *obj)
{
- GList *location;
-
- location = g_object_get_data (G_OBJECT (item), LOCATION_DATA_KEY);
+ GList *location = g_object_get_data (G_OBJECT (item), LOCATION_DATA_KEY);
if (obj->priv->current_location)
{
jump_to_location (obj, location,
- g_list_position (obj->priv->locations,
- location) >
- g_list_position (obj->priv->locations,
- obj->priv->current_location));
+ g_list_position (obj->priv->locations, location) >
+ g_list_position (obj->priv->locations, obj->priv->current_location));
}
else
{
@@ -3059,10 +2858,7 @@ on_bookmarks_row_deleted (GtkTreeModel *model,
if (!gtk_tree_model_get_iter (model, &iter, path))
return;
- location = gedit_file_bookmarks_store_get_location (obj->priv->bookmarks_store,
- &iter);
-
- if (!location)
+ if (!(location = gedit_file_bookmarks_store_get_location (obj->priv->bookmarks_store, &iter)))
return;
g_hash_table_remove (obj->priv->bookmarks_hash, location);
@@ -3075,34 +2871,26 @@ on_filter_mode_changed (GeditFileBrowserStore *model,
GParamSpec *param,
GeditFileBrowserWidget *obj)
{
+ gint mode = gedit_file_browser_store_get_filter_mode (model);
GAction *action;
GVariant *variant;
gboolean active;
- gint mode;
-
- mode = gedit_file_browser_store_get_filter_mode (model);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "show_hidden");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "show_hidden");
active = !(mode & GEDIT_FILE_BROWSER_STORE_FILTER_MODE_HIDE_HIDDEN);
variant = g_action_get_state (action);
if (active != g_variant_get_boolean (variant))
- {
g_action_change_state (action, g_variant_new_boolean (active));
- }
g_variant_unref (variant);
- action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group),
- "show_binary");
+ action = g_action_map_lookup_action (G_ACTION_MAP (obj->priv->action_group), "show_binary");
active = !(mode & GEDIT_FILE_BROWSER_STORE_FILTER_MODE_HIDE_BINARY);
variant = g_action_get_state (action);
if (active != g_variant_get_boolean (variant))
- {
g_action_change_state (action, g_variant_new_boolean (active));
- }
g_variant_unref (variant);
}
@@ -3129,9 +2917,7 @@ up_activated (GSimpleAction *action,
gpointer user_data)
{
GeditFileBrowserWidget *widget = GEDIT_FILE_BROWSER_WIDGET (user_data);
- GtkTreeModel *model;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return;
@@ -3145,16 +2931,13 @@ home_activated (GSimpleAction *action,
gpointer user_data)
{
GeditFileBrowserWidget *widget = GEDIT_FILE_BROWSER_WIDGET (user_data);
- GtkTreeModel *model;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
GFile *home_location;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
-
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return;
home_location = g_file_new_for_path (g_get_home_dir ());
-
gedit_file_browser_widget_set_root (widget, home_location, TRUE);
g_object_unref (home_location);
@@ -3166,24 +2949,18 @@ new_folder_activated (GSimpleAction *action,
gpointer user_data)
{
GeditFileBrowserWidget *widget = GEDIT_FILE_BROWSER_WIDGET (user_data);
- GtkTreeModel *model;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
GtkTreeIter parent;
GtkTreeIter iter;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
-
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return;
if (!gedit_file_browser_widget_get_selected_directory (widget, &parent))
return;
- if (gedit_file_browser_store_new_directory (GEDIT_FILE_BROWSER_STORE (model),
- &parent, &iter))
- {
- gedit_file_browser_view_start_rename (widget->priv->treeview,
- &iter);
- }
+ if (gedit_file_browser_store_new_directory (GEDIT_FILE_BROWSER_STORE (model), &parent, &iter))
+ gedit_file_browser_view_start_rename (widget->priv->treeview, &iter);
}
static void
@@ -3192,24 +2969,19 @@ open_activated (GSimpleAction *action,
gpointer user_data)
{
GeditFileBrowserWidget *widget = GEDIT_FILE_BROWSER_WIDGET (user_data);
- GtkTreeModel *model;
- GtkTreeSelection *selection;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget->priv->treeview));
GList *rows;
GList *row;
- GtkTreeIter iter;
- GtkTreePath *path;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget->priv->treeview));
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return;
rows = gtk_tree_selection_get_selected_rows (selection, &model);
-
for (row = rows; row; row = row->next)
{
- path = (GtkTreePath *)(row->data);
+ GtkTreePath *path = (GtkTreePath *)(row->data);
+ GtkTreeIter iter;
if (gtk_tree_model_get_iter (model, &iter, path))
file_open (widget, model, &iter);
@@ -3226,24 +2998,18 @@ new_file_activated (GSimpleAction *action,
gpointer user_data)
{
GeditFileBrowserWidget *widget = GEDIT_FILE_BROWSER_WIDGET (user_data);
- GtkTreeModel *model;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
GtkTreeIter parent;
GtkTreeIter iter;
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
-
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return;
if (!gedit_file_browser_widget_get_selected_directory (widget, &parent))
return;
- if (gedit_file_browser_store_new_file (GEDIT_FILE_BROWSER_STORE (model),
- &parent, &iter))
- {
- gedit_file_browser_view_start_rename (widget->priv->treeview,
- &iter);
- }
+ if (gedit_file_browser_store_new_file (GEDIT_FILE_BROWSER_STORE (model), &parent, &iter))
+ gedit_file_browser_view_start_rename (widget->priv->treeview, &iter);
}
static void
@@ -3292,39 +3058,29 @@ view_folder_activated (GSimpleAction *action,
gpointer user_data)
{
GeditFileBrowserWidget *widget = GEDIT_FILE_BROWSER_WIDGET (user_data);
- GtkTreeModel *model;
- GtkTreeSelection *selection;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget->priv->treeview));
+ GtkTreeIter iter;
GList *rows;
GList *row;
gboolean directory_opened = FALSE;
- GtkTreeIter iter;
- GtkTreePath *path;
-
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget->priv->treeview));
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget->priv->treeview));
if (!GEDIT_IS_FILE_BROWSER_STORE (model))
return;
rows = gtk_tree_selection_get_selected_rows (selection, &model);
-
for (row = rows; row; row = row->next)
{
- path = (GtkTreePath *)(row->data);
+ GtkTreePath *path = (GtkTreePath *)(row->data);
if (gtk_tree_model_get_iter (model, &iter, path))
- {
directory_opened |= directory_open (widget, model, &iter);
- }
gtk_tree_path_free (path);
}
- if (!directory_opened &&
- gedit_file_browser_widget_get_selected_directory (widget, &iter))
- {
+ if (!directory_opened && gedit_file_browser_widget_get_selected_directory (widget, &iter))
directory_open (widget, model, &iter);
- }
g_list_free (rows);
}
@@ -3361,20 +3117,15 @@ change_show_match_filename (GSimpleAction *action,
gpointer user_data)
{
GeditFileBrowserWidget *widget = GEDIT_FILE_BROWSER_WIDGET (user_data);
- gboolean visible;
+ gboolean visible = g_variant_get_boolean (state);
- visible = g_variant_get_boolean (state);
gtk_revealer_set_reveal_child (GTK_REVEALER (widget->priv->filter_entry_revealer), visible);
if (visible)
- {
gtk_widget_grab_focus (widget->priv->filter_entry);
- }
else
- {
/* clear the filter */
set_filter_pattern_real (widget, NULL, TRUE);
- }
g_simple_action_set_state (action, state);
}
@@ -3394,8 +3145,7 @@ open_in_terminal_activated (GSimpleAction *action,
gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->file_store),
&iter,
- GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION,
- &file,
+ GEDIT_FILE_BROWSER_STORE_COLUMN_LOCATION, &file,
-1);
g_signal_emit (widget, signals[OPEN_IN_TERMINAL], 0, file);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
