[anjuta] git: More glade file name fixes
- From: James Liggett <jrliggett src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] git: More glade file name fixes
- Date: Mon, 25 Mar 2013 20:27:27 +0000 (UTC)
commit 6d4774c10eb05873964020b09f01787d11c3568f
Author: James Liggett <jrliggett cox net>
Date: Fri Mar 22 20:26:03 2013 -0700
git: More glade file name fixes
plugins/git/anjuta-git.ui | 44 +++++++++++++++++++++---------------------
plugins/git/git-push-pane.c | 8 +++---
plugins/git/git-tags-pane.c | 8 +++---
3 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/plugins/git/anjuta-git.ui b/plugins/git/anjuta-git.ui
index d8817ae..1dab99f 100644
--- a/plugins/git/anjuta-git.ui
+++ b/plugins/git/anjuta-git.ui
@@ -324,6 +324,18 @@
</packing>
</child>
</object>
+ <object class="GtkListStore" id="branches_list_model">
+ <columns>
+ <!-- column-name selected -->
+ <column type="gboolean"/>
+ <!-- column-name active -->
+ <column type="gboolean"/>
+ <!-- column-name remote -->
+ <column type="gboolean"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkVBox" id="apply_mailbox_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -453,18 +465,6 @@
</packing>
</child>
</object>
- <object class="GtkListStore" id="branches_list_model">
- <columns>
- <!-- column-name selected -->
- <column type="gboolean"/>
- <!-- column-name active -->
- <column type="gboolean"/>
- <!-- column-name remote -->
- <column type="gboolean"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkVBox" id="branches_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2604,14 +2604,6 @@
<column type="gchararray"/>
</columns>
</object>
- <object class="GtkListStore" id="push_tag_model">
- <columns>
- <!-- column-name selected -->
- <column type="gboolean"/>
- <!-- column-name name -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkVBox" id="push_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2752,7 +2744,7 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn6">
<property name="title">column</property>
<child>
- <object class="GtkCellRendererToggle" id="tags_selected_renderer"/>
+ <object class="GtkCellRendererToggle" id="push_tags_selected_renderer"/>
<attributes>
<attribute name="active">0</attribute>
</attributes>
@@ -2924,6 +2916,14 @@
</packing>
</child>
</object>
+ <object class="GtkListStore" id="push_tag_model">
+ <columns>
+ <!-- column-name selected -->
+ <column type="gboolean"/>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkListStore" id="remotes_list_model">
<columns>
<!-- column-name name -->
@@ -3825,7 +3825,7 @@
<object class="GtkTreeViewColumn" id="treeviewcolumn10">
<property name="title">column</property>
<child>
- <object class="GtkCellRendererToggle" id="selected_renderer1"/>
+ <object class="GtkCellRendererToggle" id="tags_selected_renderer"/>
<attributes>
<attribute name="active">0</attribute>
</attributes>
diff --git a/plugins/git/git-push-pane.c b/plugins/git/git-push-pane.c
index 376ae0a..2bb945a 100644
--- a/plugins/git/git-push-pane.c
+++ b/plugins/git/git-push-pane.c
@@ -253,7 +253,7 @@ git_push_pane_init (GitPushPane *self)
GtkTreeModel *push_branch_model;
GtkTreeModel *push_tag_model;
GtkCellRenderer *branches_selected_renderer;
- GtkCellRenderer *tags_selected_renderer;
+ GtkCellRenderer *push_tags_selected_renderer;
GtkWidget *push_all_tags_check;
GtkWidget *push_all_check;;
@@ -285,8 +285,8 @@ git_push_pane_init (GitPushPane *self)
"push_tag_model"));
branches_selected_renderer = GTK_CELL_RENDERER (gtk_builder_get_object (self->priv->builder,
"branches_selected_renderer"));
- tags_selected_renderer = GTK_CELL_RENDERER (gtk_builder_get_object (self->priv->builder,
- "tags_selected_renderer"));
+ push_tags_selected_renderer = GTK_CELL_RENDERER (gtk_builder_get_object (self->priv->builder,
+
"push_tags_selected_renderer"));
push_all_tags_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
"push_all_tags_check"));
push_all_check = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
@@ -306,7 +306,7 @@ git_push_pane_init (GitPushPane *self)
G_CALLBACK (on_selected_renderer_toggled),
push_branch_model);
- g_signal_connect (G_OBJECT (tags_selected_renderer), "toggled",
+ g_signal_connect (G_OBJECT (push_tags_selected_renderer), "toggled",
G_CALLBACK (on_selected_renderer_toggled),
push_tag_model);
diff --git a/plugins/git/git-tags-pane.c b/plugins/git/git-tags-pane.c
index f360f5d..595e25b 100644
--- a/plugins/git/git-tags-pane.c
+++ b/plugins/git/git-tags-pane.c
@@ -171,7 +171,7 @@ git_tags_pane_init (GitTagsPane *self)
NULL};
GError *error = NULL;
GtkTreeView *tags_view;
- GtkCellRenderer *selected_renderer;
+ GtkCellRenderer *tags_selected_renderer;
self->priv = g_new0 (GitTagsPanePriv, 1);
self->priv->builder = gtk_builder_new ();
@@ -190,8 +190,8 @@ git_tags_pane_init (GitTagsPane *self)
self->priv->tags_list_model =
GTK_LIST_STORE (gtk_builder_get_object (self->priv->builder,
"tags_list_model"));
- selected_renderer = GTK_CELL_RENDERER (gtk_builder_get_object (self->priv->builder,
- "selected_renderer"));
+ tags_selected_renderer = GTK_CELL_RENDERER (gtk_builder_get_object (self->priv->builder,
+ "tags_selected_renderer"));
/* DND */
gtk_tree_view_enable_model_drag_source (tags_view,
@@ -204,7 +204,7 @@ git_tags_pane_init (GitTagsPane *self)
G_CALLBACK (on_tags_list_view_drag_data_get),
NULL);
- g_signal_connect (G_OBJECT (selected_renderer), "toggled",
+ g_signal_connect (G_OBJECT (tags_selected_renderer), "toggled",
G_CALLBACK (on_selected_renderer_toggled),
self);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]