aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-05-21 17:19:39 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-05-21 17:19:39 +0800
commitefb8ae532d2db4e7e8628942e178b862ab4e0d44 (patch)
treecf615a778254fb9fbdae0d563d1f795a07657b72
parenta8e001d0b5fe18f524116b8bbfa9854799d1028f (diff)
downloadgsoc2013-empathy-efb8ae532d2db4e7e8628942e178b862ab4e0d44.tar
gsoc2013-empathy-efb8ae532d2db4e7e8628942e178b862ab4e0d44.tar.gz
gsoc2013-empathy-efb8ae532d2db4e7e8628942e178b862ab4e0d44.tar.bz2
gsoc2013-empathy-efb8ae532d2db4e7e8628942e178b862ab4e0d44.tar.lz
gsoc2013-empathy-efb8ae532d2db4e7e8628942e178b862ab4e0d44.tar.xz
gsoc2013-empathy-efb8ae532d2db4e7e8628942e178b862ab4e0d44.tar.zst
gsoc2013-empathy-efb8ae532d2db4e7e8628942e178b862ab4e0d44.zip
Add help button on accounts dialog. Fixes bug #533732 (Milo Casagrande).
svn path=/trunk/; revision=1114
-rw-r--r--libempathy-gtk/empathy-accounts-dialog.c22
-rw-r--r--libempathy-gtk/empathy-accounts-dialog.glade18
2 files changed, 32 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c
index e48aaab31..177fc6fe8 100644
--- a/libempathy-gtk/empathy-accounts-dialog.c
+++ b/libempathy-gtk/empathy-accounts-dialog.c
@@ -138,6 +138,8 @@ static void accounts_dialog_button_back_clicked_cb (GtkWidget
EmpathyAccountsDialog *dialog);
static void accounts_dialog_button_add_clicked_cb (GtkWidget *button,
EmpathyAccountsDialog *dialog);
+static void accounts_dialog_button_help_clicked_cb (GtkWidget *button,
+ EmpathyAccountsDialog *dialog);
static void accounts_dialog_remove_response_cb (GtkWidget *dialog,
gint response,
McAccount *account);
@@ -884,6 +886,13 @@ accounts_dialog_button_add_clicked_cb (GtkWidget *button,
}
static void
+accounts_dialog_button_help_clicked_cb (GtkWidget *button,
+ EmpathyAccountsDialog *dialog)
+{
+ empathy_url_show ("ghelp:empathy?empathy-create-account");
+}
+
+static void
accounts_dialog_remove_response_cb (GtkWidget *dialog,
gint response,
McAccount *account)
@@ -944,7 +953,9 @@ accounts_dialog_response_cb (GtkWidget *widget,
gint response,
EmpathyAccountsDialog *dialog)
{
- gtk_widget_destroy (widget);
+ if (response == GTK_RESPONSE_CLOSE) {
+ gtk_widget_destroy (widget);
+ }
}
static void
@@ -995,10 +1006,8 @@ GtkWidget *
empathy_accounts_dialog_show (GtkWindow *parent)
{
static EmpathyAccountsDialog *dialog = NULL;
- GladeXML *glade;
- gchar *filename;
- GtkWidget *bbox;
- GtkWidget *button_close;
+ GladeXML *glade;
+ gchar *filename;
if (dialog) {
gtk_window_present (GTK_WINDOW (dialog->window));
@@ -1018,7 +1027,6 @@ empathy_accounts_dialog_show (GtkWindow *parent)
"label_no_account", &dialog->label_no_account,
"label_no_account_blurb", &dialog->label_no_account_blurb,
"alignment_settings", &dialog->alignment_settings,
- "dialog-action_area", &bbox,
"treeview", &dialog->treeview,
"frame_new_account", &dialog->frame_new_account,
"hbox_type", &dialog->hbox_type,
@@ -1028,7 +1036,6 @@ empathy_accounts_dialog_show (GtkWindow *parent)
"label_name", &dialog->label_name,
"button_add", &dialog->button_add,
"button_remove", &dialog->button_remove,
- "button_close", &button_close,
NULL);
g_free (filename);
@@ -1040,6 +1047,7 @@ empathy_accounts_dialog_show (GtkWindow *parent)
"button_back", "clicked", accounts_dialog_button_back_clicked_cb,
"button_add", "clicked", accounts_dialog_button_add_clicked_cb,
"button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
+ "button_help", "clicked", accounts_dialog_button_help_clicked_cb,
NULL);
g_object_add_weak_pointer (G_OBJECT (dialog->window), (gpointer) &dialog);
diff --git a/libempathy-gtk/empathy-accounts-dialog.glade b/libempathy-gtk/empathy-accounts-dialog.glade
index 9ed29b8da..9678092f2 100644
--- a/libempathy-gtk/empathy-accounts-dialog.glade
+++ b/libempathy-gtk/empathy-accounts-dialog.glade
@@ -329,14 +329,30 @@ If you do not want to add an account, simply click on the account you want to co
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
+ <widget class="GtkButton" id="button_help">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-help</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-11</property>
+ </widget>
+ <packing>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton" id="button_close">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
+ <property name="response_id">-7</property>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>