Commit fb59be8b authored by James Liggett's avatar James Liggett

git: Widget name fixes

parent f39aeb31
......@@ -951,7 +951,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="name_entry">
<object class="GtkEntry" id="author_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char"></property>
......@@ -963,7 +963,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="email_entry">
<object class="GtkEntry" id="author_email_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char"></property>
......
......@@ -101,8 +101,8 @@ on_ok_action_activated (GtkAction *action, GitCommitPane *self)
gchar *log;
gchar *author_name;
gchar *author_email;
GtkEditable *name_entry;
GtkEditable *email_entry;
GtkEditable *author_name_entry;
GtkEditable *author_email_entry;
GList *selected_paths;
GitCommitCommand *commit_command;
......@@ -130,21 +130,21 @@ on_ok_action_activated (GtkAction *action, GitCommitPane *self)
if (gtk_toggle_button_get_active (use_custom_author_info_check))
{
name_entry = GTK_EDITABLE (gtk_builder_get_object (self->priv->builder,
"name_entry"));
email_entry = GTK_EDITABLE (gtk_builder_get_object (self->priv->builder,
"email_entry"));
author_name_entry = GTK_EDITABLE (gtk_builder_get_object (self->priv->builder,
"author_name_entry"));
author_email_entry = GTK_EDITABLE (gtk_builder_get_object (self->priv->builder,
"author_email_entry"));
author_name = gtk_editable_get_chars (name_entry, 0, -1);
author_email = gtk_editable_get_chars (email_entry, 0, -1);
author_name = gtk_editable_get_chars (author_name_entry, 0, -1);
author_email = gtk_editable_get_chars (author_email_entry, 0, -1);
/* Check both the name and e-mail fields with one statement instead of
* two */
if (!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
GTK_WIDGET (name_entry), author_name,
GTK_WIDGET (author_name_entry), author_name,
_("Please enter the commit author's name")) ||
!git_pane_check_input (GTK_WIDGET (ANJUTA_PLUGIN (plugin)->shell),
GTK_WIDGET (email_entry),
GTK_WIDGET (author_email_entry),
author_email,
_("Please enter the commit author's e-mail address.")))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment