summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-02-08 14:50:22 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-02-08 14:50:22 +0000
commit03a537d3de48963b22b9c09fefefda93088c70ae (patch)
tree45cfe461964cbdfb4445e5c64bc6714cc013dc3b /common
parent508a1473601cb075a01e91462e8f1fab58af9bfa (diff)
downloadgvfs-03a537d3de48963b22b9c09fefefda93088c70ae.tar.gz
Fix up indentation Don't unref file from g_file_icon_get_file().
2008-02-08 Alexander Larsson <alexl@redhat.com> * common/gvfsdaemonprotocol.c: Fix up indentation Don't unref file from g_file_icon_get_file(). svn path=/trunk/; revision=1238
Diffstat (limited to 'common')
-rw-r--r--common/gvfsdaemonprotocol.c49
1 files changed, 24 insertions, 25 deletions
diff --git a/common/gvfsdaemonprotocol.c b/common/gvfsdaemonprotocol.c
index 24b75806..b6f084fc 100644
--- a/common/gvfsdaemonprotocol.c
+++ b/common/gvfsdaemonprotocol.c
@@ -32,36 +32,36 @@
static const char *
get_object_signature (GObject *obj)
{
- if (G_IS_THEMED_ICON (obj))
+ if (G_IS_THEMED_ICON (obj))
+ {
+ return
+ DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_UINT32_AS_STRING
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING
+ DBUS_STRUCT_END_CHAR_AS_STRING;
+ }
+ else if (G_IS_FILE_ICON (obj))
+ {
+ GFile *file;
+ char *path;
+
+ file = g_file_icon_get_file (G_FILE_ICON (obj));
+
+ path = g_file_get_path (file);
+ if (path)
{
+ g_free (path);
return
DBUS_STRUCT_BEGIN_CHAR_AS_STRING
DBUS_TYPE_UINT32_AS_STRING
- DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING
DBUS_STRUCT_END_CHAR_AS_STRING;
}
- else if (G_IS_FILE_ICON (obj))
- {
- GFile *file;
- char *path;
-
- file = g_file_icon_get_file (G_FILE_ICON (obj));
-
- path = g_file_get_path (file);
- if (path)
- {
- g_free (path);
- return
- DBUS_STRUCT_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_UINT32_AS_STRING
- DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING
- DBUS_STRUCT_END_CHAR_AS_STRING;
- }
- }
- return
- DBUS_STRUCT_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_UINT32_AS_STRING
- DBUS_STRUCT_END_CHAR_AS_STRING;
+ }
+ return
+ DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+ DBUS_TYPE_UINT32_AS_STRING
+ DBUS_STRUCT_END_CHAR_AS_STRING;
}
static void
@@ -144,7 +144,6 @@ append_object (DBusMessageIter *iter, GObject *obj)
DBUS_TYPE_UINT32, &v_uint32))
_g_dbus_oom ();
}
- g_object_unref (file);
}
else
{