[Xfce4-commits] [xfce/xfce4-settings] 01/01: Cast to correct types
noreply at xfce.org
noreply at xfce.org
Sun Mar 18 21:50:34 CET 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h x f c e - 4 . 1 2
in repository xfce/xfce4-settings.
commit 8ec78275a80734536ee1f6697683294bbe60db6b
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun Mar 18 16:50:29 2018 -0400
Cast to correct types
---
xfce4-settings-editor/xfce-settings-editor-box.c | 18 +++++++++---------
xfce4-settings-editor/xfce-settings-prop-dialog.c | 2 +-
xfce4-settings-manager/xfce-settings-manager-dialog.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/xfce4-settings-editor/xfce-settings-editor-box.c b/xfce4-settings-editor/xfce-settings-editor-box.c
index da026a9..bc9494f 100644
--- a/xfce4-settings-editor/xfce-settings-editor-box.c
+++ b/xfce4-settings-editor/xfce-settings-editor-box.c
@@ -66,7 +66,7 @@ struct _XfceSettingsEditorBox
GtkWidget *button_new;
GtkWidget *button_edit;
GtkWidget *button_reset;
-
+
gint paned_pos;
};
@@ -145,7 +145,7 @@ static void xfce_settings_editor_box_get_property (GObject *object,
{
XfceSettingsEditorBox *self;
self = XFCE_SETTINGS_EDITOR_BOX (object);
-
+
switch (prop_id)
{
case PROP_PANED_POSITION:
@@ -165,7 +165,7 @@ static void xfce_settings_editor_box_set_property (GObject *object,
{
XfceSettingsEditorBox *self;
self = XFCE_SETTINGS_EDITOR_BOX (object);
-
+
switch (prop_id)
{
case PROP_PANED_POSITION:
@@ -207,7 +207,7 @@ xfce_settings_editor_box_init (XfceSettingsEditorBox *self)
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self->props_store),
PROP_COLUMN_NAME, GTK_SORT_ASCENDING);
self->paned = paned = gtk_hpaned_new ();
-
+
gtk_box_pack_start (GTK_BOX (self), paned, TRUE, TRUE, 0);
gtk_paned_set_position (GTK_PANED (paned), self->paned_pos);
gtk_container_set_border_width (GTK_CONTAINER (paned), 6);
@@ -347,9 +347,9 @@ static void
xfce_settings_editor_box_class_init (XfceSettingsEditorBoxClass *klass)
{
GObjectClass *gobject_class;
-
+
gobject_class = G_OBJECT_CLASS (klass);
-
+
gobject_class->set_property = xfce_settings_editor_box_set_property;
gobject_class->get_property = xfce_settings_editor_box_get_property;
@@ -363,7 +363,7 @@ xfce_settings_editor_box_class_init (XfceSettingsEditorBoxClass *klass)
10,
G_PARAM_CONSTRUCT |
G_PARAM_READWRITE));
-
+
gobject_class->finalize = xfce_settings_editor_box_finalize;
}
@@ -389,7 +389,7 @@ xfce_settings_editor_box_finalize (GObject *object)
g_object_unref (G_OBJECT (self->props_store));
if (self->props_channel != NULL)
g_object_unref (G_OBJECT (self->props_channel));
-
+
G_OBJECT_CLASS (xfce_settings_editor_box_parent_class)->finalize (object);
}
@@ -728,7 +728,7 @@ xfce_settings_editor_box_properties_load (XfceSettingsEditorBox *self,
gtk_tree_store_clear (self->props_store);
- self->props_channel = g_object_ref (G_OBJECT (channel));
+ self->props_channel = (XfconfChannel *) g_object_ref (G_OBJECT (channel));
props = xfconf_channel_get_properties (channel, NULL);
if (G_LIKELY (props != NULL))
diff --git a/xfce4-settings-editor/xfce-settings-prop-dialog.c b/xfce4-settings-editor/xfce-settings-prop-dialog.c
index 093e5f2..4164601 100644
--- a/xfce4-settings-editor/xfce-settings-prop-dialog.c
+++ b/xfce4-settings-editor/xfce-settings-prop-dialog.c
@@ -645,7 +645,7 @@ xfce_settings_prop_dialog_new (GtkWindow *parent,
dialog = g_object_new (XFCE_TYPE_SETTINGS_PROP_DIALOG, NULL);
- dialog->channel = g_object_ref (G_OBJECT (channel));
+ dialog->channel = (XfconfChannel *) g_object_ref (G_OBJECT (channel));
if (property != NULL)
{
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 6863455..b82de80 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -1046,7 +1046,7 @@ xfce_settings_manager_dialog_add_category (XfceSettingsManagerDialog *dialog,
DialogCategory *category;
category = g_slice_new0 (DialogCategory);
- category->directory = g_object_ref (G_OBJECT (directory));
+ category->directory = (GarconMenuDirectory *) g_object_ref (G_OBJECT (directory));
category->dialog = dialog;
/* filter category from main store */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list