aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-10-17 20:45:58 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-10-17 20:45:58 +0800
commitff25dd40df695988f027d841a096a20199662c78 (patch)
tree6a611d5a158abe66df1d603606ba3fd837844715
parente81329115e57fd14600e0638a8d6db45df1b2e74 (diff)
downloadgsoc2013-empathy-ff25dd40df695988f027d841a096a20199662c78.tar
gsoc2013-empathy-ff25dd40df695988f027d841a096a20199662c78.tar.gz
gsoc2013-empathy-ff25dd40df695988f027d841a096a20199662c78.tar.bz2
gsoc2013-empathy-ff25dd40df695988f027d841a096a20199662c78.tar.lz
gsoc2013-empathy-ff25dd40df695988f027d841a096a20199662c78.tar.xz
gsoc2013-empathy-ff25dd40df695988f027d841a096a20199662c78.tar.zst
gsoc2013-empathy-ff25dd40df695988f027d841a096a20199662c78.zip
Added an "Import accounts" button to the accounts dialog. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1597
-rw-r--r--src/empathy-accounts-dialog.c13
-rw-r--r--src/empathy-accounts-dialog.glade42
2 files changed, 44 insertions, 11 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index a9666f575..d3d0ff86c 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -46,6 +46,7 @@
#include <libempathy-gtk/empathy-account-widget-sip.h>
#include "empathy-accounts-dialog.h"
+#include "empathy-import-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include <libempathy/empathy-debug.h>
@@ -65,6 +66,7 @@ typedef struct {
GtkWidget *button_add;
GtkWidget *button_remove;
+ GtkWidget *button_import;
GtkWidget *frame_new_account;
GtkWidget *combobox_profile;
@@ -144,6 +146,8 @@ static void accounts_dialog_button_help_clicked_cb (GtkWidget
EmpathyAccountsDialog *dialog);
static void accounts_dialog_button_remove_clicked_cb (GtkWidget *button,
EmpathyAccountsDialog *dialog);
+static void accounts_dialog_button_import_clicked_cb (GtkWidget *button,
+ EmpathyAccountsDialog *dialog);
static void accounts_dialog_response_cb (GtkWidget *widget,
gint response,
EmpathyAccountsDialog *dialog);
@@ -999,6 +1003,13 @@ accounts_dialog_button_remove_clicked_cb (GtkWidget *button,
}
static void
+accounts_dialog_button_import_clicked_cb (GtkWidget *button,
+ EmpathyAccountsDialog *dialog)
+{
+ empathy_import_dialog_show (GTK_WINDOW (dialog->window));
+}
+
+static void
accounts_dialog_response_cb (GtkWidget *widget,
gint response,
EmpathyAccountsDialog *dialog)
@@ -1090,6 +1101,7 @@ empathy_accounts_dialog_show (GtkWindow *parent,
"label_name", &dialog->label_name,
"button_add", &dialog->button_add,
"button_remove", &dialog->button_remove,
+ "button_import", &dialog->button_import,
NULL);
g_free (filename);
@@ -1101,6 +1113,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_import", "clicked", accounts_dialog_button_import_clicked_cb,
"button_help", "clicked", accounts_dialog_button_help_clicked_cb,
NULL);
diff --git a/src/empathy-accounts-dialog.glade b/src/empathy-accounts-dialog.glade
index 110730814..6091e4aa4 100644
--- a/src/empathy-accounts-dialog.glade
+++ b/src/empathy-accounts-dialog.glade
@@ -40,25 +40,46 @@
</widget>
</child>
<child>
- <widget class="GtkHBox" id="hbox148">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="spacing">6</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkButton" id="button_add">
+ <widget class="GtkHBox" id="hbox148">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkButton" id="button_add">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-add</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_remove">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-remove</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
<child>
- <widget class="GtkButton" id="button_remove">
+ <widget class="GtkButton" id="button_import">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
+ <property name="label" translatable="yes">Import accounts</property>
<property name="response_id">0</property>
</widget>
<packing>
@@ -68,7 +89,6 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>