[gnome-builder] source-view: make file check more succinct
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] source-view: make file check more succinct
- Date: Sun, 26 Apr 2015 00:45:36 +0000 (UTC)
commit 9a747239141f36aa17fb95a361de633ecd067b3d
Author: Christian Hergert <christian hergert me>
Date: Sat Apr 25 17:39:55 2015 -0700
source-view: make file check more succinct
libide/ide-source-view.c | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/libide/ide-source-view.c b/libide/ide-source-view.c
index 39b7c41..96acd08 100644
--- a/libide/ide-source-view.c
+++ b/libide/ide-source-view.c
@@ -3640,32 +3640,21 @@ ide_source_view_real_push_snippet (IdeSourceView *self,
const GtkTextIter *location)
{
IdeSourceViewPrivate *priv = ide_source_view_get_instance_private (self);
+ IdeFile *file;
+ GFile *gfile;
g_assert (IDE_IS_SOURCE_VIEW (self));
g_assert (IDE_IS_SOURCE_SNIPPET (snippet));
g_assert (IDE_IS_SOURCE_SNIPPET_CONTEXT (context));
- if (priv->buffer != NULL)
+ if ((priv->buffer != NULL) &&
+ (file = ide_buffer_get_file (priv->buffer)) &&
+ (gfile = ide_file_get_file (file)))
{
- IdeFile *file;
-
- file = ide_buffer_get_file (priv->buffer);
-
- if (file != NULL)
- {
- GFile *gfile;
+ g_autofree gchar *name = NULL;
- gfile = ide_file_get_file (file);
-
- if (gfile != NULL)
- {
- gchar *name = NULL;
-
- name = g_file_get_basename (gfile);
- ide_source_snippet_context_add_variable (context, "filename", name);
- g_free (name);
- }
- }
+ name = g_file_get_basename (gfile);
+ ide_source_snippet_context_add_variable (context, "filename", name);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]