summaryrefslogtreecommitdiff
path: root/libnautilus-extension/nautilus-column.c
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@gnome.org>2018-02-01 13:41:39 +0200
committerErnestas Kulik <ernestask@gnome.org>2018-02-09 06:32:38 +0200
commit7e2605c681d065e6b0a3d779c30b892932597991 (patch)
tree44bccc88603a7cc530a80de6349df69d3413a148 /libnautilus-extension/nautilus-column.c
parent2128efccae664ba12a870deb1720a08e58954dd2 (diff)
downloadnautilus-7e2605c681d065e6b0a3d779c30b892932597991.tar.gz
general: refactor extension library
The changes include: * adding a single-include header and deprecating nautilus-extension-types.h and direct inclusions of individual headers; * type definition simplifications - this causes some breakages in nautilus-file, because NautilusFile used to be typedefed to NautilusFileInfo, and that is no longer possible, so the interface implementation was moved to static functions and the public NautilusFile API provides thin wrappers for them to maintain compatibility; * documentation cleanups and reorganization; * general build rule and code cleanups: mostly g_auto* sprinkled around and style changes (sorry)
Diffstat (limited to 'libnautilus-extension/nautilus-column.c')
-rw-r--r--libnautilus-extension/nautilus-column.c50
1 files changed, 23 insertions, 27 deletions
diff --git a/libnautilus-extension/nautilus-column.c b/libnautilus-extension/nautilus-column.c
index fdf83204c..a36885091 100644
--- a/libnautilus-extension/nautilus-column.c
+++ b/libnautilus-extension/nautilus-column.c
@@ -21,8 +21,6 @@
*
*/
-#include <config.h>
-#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include "nautilus-column.h"
@@ -39,8 +37,10 @@ enum
LAST_PROP
};
-struct _NautilusColumnDetails
+struct _NautilusColumn
{
+ GObject parent_instance;
+
char *name;
GQuark attribute;
char *label;
@@ -55,7 +55,6 @@ G_DEFINE_TYPE (NautilusColumn, nautilus_column, G_TYPE_OBJECT);
* SECTION:nautilus-column
* @title: NautilusColumn
* @short_description: List view column descriptor object
- * @include: libnautilus-extension/nautilus-column.h
*
* #NautilusColumn is an object that describes a column in the file manager
* list view. Extensions can provide #NautilusColumn by registering a
@@ -112,43 +111,43 @@ nautilus_column_get_property (GObject *object,
{
case PROP_NAME:
{
- g_value_set_string (value, column->details->name);
+ g_value_set_string (value, column->name);
}
break;
case PROP_ATTRIBUTE:
{
- g_value_set_string (value, g_quark_to_string (column->details->attribute));
+ g_value_set_string (value, g_quark_to_string (column->attribute));
}
break;
case PROP_ATTRIBUTE_Q:
{
- g_value_set_uint (value, column->details->attribute);
+ g_value_set_uint (value, column->attribute);
}
break;
case PROP_LABEL:
{
- g_value_set_string (value, column->details->label);
+ g_value_set_string (value, column->label);
}
break;
case PROP_DESCRIPTION:
{
- g_value_set_string (value, column->details->description);
+ g_value_set_string (value, column->description);
}
break;
case PROP_XALIGN:
{
- g_value_set_float (value, column->details->xalign);
+ g_value_set_float (value, column->xalign);
}
break;
case PROP_DEFAULT_SORT_ORDER:
{
- g_value_set_enum (value, column->details->default_sort_order);
+ g_value_set_enum (value, column->default_sort_order);
}
break;
@@ -174,15 +173,15 @@ nautilus_column_set_property (GObject *object,
{
case PROP_NAME:
{
- g_free (column->details->name);
- column->details->name = g_strdup (g_value_get_string (value));
+ g_free (column->name);
+ column->name = g_strdup (g_value_get_string (value));
g_object_notify (object, "name");
}
break;
case PROP_ATTRIBUTE:
{
- column->details->attribute = g_quark_from_string (g_value_get_string (value));
+ column->attribute = g_quark_from_string (g_value_get_string (value));
g_object_notify (object, "attribute");
g_object_notify (object, "attribute_q");
}
@@ -190,30 +189,30 @@ nautilus_column_set_property (GObject *object,
case PROP_LABEL:
{
- g_free (column->details->label);
- column->details->label = g_strdup (g_value_get_string (value));
+ g_free (column->label);
+ column->label = g_strdup (g_value_get_string (value));
g_object_notify (object, "label");
}
break;
case PROP_DESCRIPTION:
{
- g_free (column->details->description);
- column->details->description = g_strdup (g_value_get_string (value));
+ g_free (column->description);
+ column->description = g_strdup (g_value_get_string (value));
g_object_notify (object, "description");
}
break;
case PROP_XALIGN:
{
- column->details->xalign = g_value_get_float (value);
+ column->xalign = g_value_get_float (value);
g_object_notify (object, "xalign");
}
break;
case PROP_DEFAULT_SORT_ORDER:
{
- column->details->default_sort_order = g_value_get_enum (value);
+ column->default_sort_order = g_value_get_enum (value);
g_object_notify (object, "default-sort-order");
}
break;
@@ -233,11 +232,9 @@ nautilus_column_finalize (GObject *object)
column = NAUTILUS_COLUMN (object);
- g_free (column->details->name);
- g_free (column->details->label);
- g_free (column->details->description);
-
- g_free (column->details);
+ g_free (column->name);
+ g_free (column->label);
+ g_free (column->description);
G_OBJECT_CLASS (nautilus_column_parent_class)->finalize (object);
}
@@ -245,8 +242,7 @@ nautilus_column_finalize (GObject *object)
static void
nautilus_column_init (NautilusColumn *column)
{
- column->details = g_new0 (NautilusColumnDetails, 1);
- column->details->xalign = 0.0;
+ column->xalign = 0.0;
}
static void