[gthumb] folder tree: only use the root-uri property, make it construction only
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] folder tree: only use the root-uri property, make it construction only
- Date: Sun, 24 Nov 2019 12:26:54 +0000 (UTC)
commit 3a7a2e027c9953263771f2f6b90299ba7b3124eb
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sat Nov 2 11:34:17 2019 +0100
folder tree: only use the root-uri property, make it construction only
gthumb/gth-folder-tree.c | 38 ++++++++++++--------------------------
1 file changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/gthumb/gth-folder-tree.c b/gthumb/gth-folder-tree.c
index e4036f19..f8641269 100644
--- a/gthumb/gth-folder-tree.c
+++ b/gthumb/gth-folder-tree.c
@@ -67,7 +67,6 @@ enum {
enum {
PROP_0,
- PROP_ROOT,
PROP_ROOT_URI
};
@@ -137,21 +136,19 @@ gth_folder_tree_set_property (GObject *object,
self = GTH_FOLDER_TREE (object);
switch (property_id) {
- case PROP_ROOT:
- _g_object_unref (self->priv->root);
- self->priv->root = _g_object_ref (g_value_get_object (value));
- if (self->priv->root == NULL)
- self->priv->root = g_file_new_for_uri (DEFAULT_URI);
- break;
-
case PROP_ROOT_URI:
- _g_object_unref (self->priv->root);
- self->priv->root = NULL;
uri = g_value_get_string (value);
- if (uri != NULL)
- self->priv->root = g_file_new_for_uri (uri);
- if (self->priv->root == NULL)
- self->priv->root = g_file_new_for_uri (DEFAULT_URI);
+ if (uri != NULL) {
+ GFile *new_root;
+
+ new_root = g_file_new_for_uri (uri);
+ if (new_root != NULL) {
+ _g_object_unref (self->priv->root);
+ self->priv->root = _g_object_ref (new_root);
+ }
+
+ _g_object_unref (new_root);
+ }
break;
default:
@@ -172,10 +169,6 @@ gth_folder_tree_get_property (GObject *object,
self = GTH_FOLDER_TREE (object);
switch (property_id) {
- case PROP_ROOT:
- g_value_set_object (value, self->priv->root);
- break;
-
case PROP_ROOT_URI:
uri = g_file_get_uri (self->priv->root);
g_value_set_string (value, uri);
@@ -235,20 +228,13 @@ gth_folder_tree_class_init (GthFolderTreeClass *class)
/* properties */
- g_object_class_install_property (object_class,
- PROP_ROOT,
- g_param_spec_object ("root",
- "Root",
- "The root of the folder tree",
- G_TYPE_FILE,
- G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_ROOT_URI,
g_param_spec_string ("root-uri",
"Root uri",
"The root of the folder tree as an uri",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/* signals */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]