[glade] Gtk plugin: glade_base_editor_new() do not use main_editable param
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Gtk plugin: glade_base_editor_new() do not use main_editable param
- Date: Sun, 31 Dec 2017 17:51:48 +0000 (UTC)
commit 1cfda057e1f44ba8c00a244a851aaf2669cb0f41
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Sun Dec 31 14:50:05 2017 -0300
Gtk plugin: glade_base_editor_new() do not use main_editable param
plugins/gtk+/glade-gtk-action-group.c | 6 +-----
plugins/gtk+/glade-gtk-cell-layout.c | 8 +-------
plugins/gtk+/glade-gtk-text-tag-table.c | 6 +-----
plugins/gtk+/glade-gtk-tree-view.c | 10 ++--------
4 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/plugins/gtk+/glade-gtk-action-group.c b/plugins/gtk+/glade-gtk-action-group.c
index bcac7be..7ccde39 100644
--- a/plugins/gtk+/glade-gtk-action-group.c
+++ b/plugins/gtk+/glade-gtk-action-group.c
@@ -198,9 +198,7 @@ static void
glade_gtk_action_launch_editor (GObject *action)
{
GladeWidget *widget = glade_widget_get_from_gobject (action);
- GladeWidgetAdaptor *adaptor = glade_widget_get_adaptor (widget);
GladeBaseEditor *editor;
- GladeEditable *action_editor;
GtkWidget *window;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
GType type_action = GTK_TYPE_ACTION;
@@ -212,10 +210,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/* Make sure we get the group here */
widget = glade_widget_get_toplevel (widget);
- action_editor = glade_widget_adaptor_create_editable (adaptor, GLADE_PAGE_GENERAL);
-
/* Editor */
- editor = glade_base_editor_new (glade_widget_get_object (widget), action_editor,
+ editor = glade_base_editor_new (glade_widget_get_object (widget), NULL,
_("Action"), type_action,
_("Toggle"), type_toggle_action,
_("Radio"), type_radio_action,
diff --git a/plugins/gtk+/glade-gtk-cell-layout.c b/plugins/gtk+/glade-gtk-cell-layout.c
index ba5ae1f..f3b0fb2 100644
--- a/plugins/gtk+/glade-gtk-cell-layout.c
+++ b/plugins/gtk+/glade-gtk-cell-layout.c
@@ -398,17 +398,11 @@ glade_gtk_cell_layout_move_child (GladeBaseEditor * editor,
static void
glade_gtk_cell_layout_launch_editor (GObject *layout, gchar *window_name)
{
- GladeWidget *widget = glade_widget_get_from_gobject (layout);
- GladeWidgetAdaptor *adaptor = glade_widget_get_adaptor (widget);
GladeBaseEditor *editor;
- GladeEditable *layout_editor;
GtkWidget *window;
- layout_editor = glade_widget_adaptor_create_editable (adaptor, GLADE_PAGE_GENERAL);
- layout_editor = (GladeEditable *) glade_tree_view_editor_new (adaptor, layout_editor);
-
/* Editor */
- editor = glade_base_editor_new (layout, layout_editor,
+ editor = glade_base_editor_new (layout, NULL,
_("Text"), GTK_TYPE_CELL_RENDERER_TEXT,
_("Accelerator"), GTK_TYPE_CELL_RENDERER_ACCEL,
_("Combo"), GTK_TYPE_CELL_RENDERER_COMBO,
diff --git a/plugins/gtk+/glade-gtk-text-tag-table.c b/plugins/gtk+/glade-gtk-text-tag-table.c
index df2a05b..e553ab1 100644
--- a/plugins/gtk+/glade-gtk-text-tag-table.c
+++ b/plugins/gtk+/glade-gtk-text-tag-table.c
@@ -140,15 +140,11 @@ static void
glade_gtk_text_tag_table_launch_editor (GObject *table)
{
GladeWidget *widget = glade_widget_get_from_gobject (table);
- GladeWidgetAdaptor *adaptor = glade_widget_get_adaptor (widget);
GladeBaseEditor *editor;
- GladeEditable *action_editor;
GtkWidget *window;
- action_editor = glade_widget_adaptor_create_editable (adaptor, GLADE_PAGE_GENERAL);
-
/* Editor */
- editor = glade_base_editor_new (glade_widget_get_object (widget), action_editor,
+ editor = glade_base_editor_new (glade_widget_get_object (widget), NULL,
_("Tag"), GTK_TYPE_TEXT_TAG,
NULL);
diff --git a/plugins/gtk+/glade-gtk-tree-view.c b/plugins/gtk+/glade-gtk-tree-view.c
index eb5bef5..cf1c627 100644
--- a/plugins/gtk+/glade-gtk-tree-view.c
+++ b/plugins/gtk+/glade-gtk-tree-view.c
@@ -72,19 +72,13 @@ glade_gtk_treeview_add_verify (GladeWidgetAdaptor *adaptor,
}
void
-glade_gtk_treeview_launch_editor (GObject * treeview)
+glade_gtk_treeview_launch_editor (GObject *treeview)
{
- GladeWidget *widget = glade_widget_get_from_gobject (treeview);
- GladeWidgetAdaptor *adaptor = glade_widget_get_adaptor (widget);
GladeBaseEditor *editor;
- GladeEditable *treeview_editor;
GtkWidget *window;
- treeview_editor = glade_widget_adaptor_create_editable (adaptor, GLADE_PAGE_GENERAL);
- treeview_editor = (GladeEditable *) glade_tree_view_editor_new (adaptor, treeview_editor);
-
/* Editor */
- editor = glade_base_editor_new (treeview, treeview_editor,
+ editor = glade_base_editor_new (treeview, NULL,
_("Column"), GTK_TYPE_TREE_VIEW_COLUMN, NULL);
glade_base_editor_append_types (editor, GTK_TYPE_TREE_VIEW_COLUMN,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]