empathy r860 - in trunk: data libempathy-gtk
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r860 - in trunk: data libempathy-gtk
- Date: Wed, 2 Apr 2008 13:56:23 +0100 (BST)
Author: xclaesse
Date: Wed Apr 2 13:56:23 2008
New Revision: 860
URL: http://svn.gnome.org/viewvc/empathy?rev=860&view=rev
Log:
Add a widget to configure AIM accounts. Fixes bug #513676 (Andreas Henriksson).
Added:
trunk/libempathy-gtk/empathy-account-widget-aim.glade
Modified:
trunk/data/aim.profile
trunk/libempathy-gtk/Makefile.am
trunk/libempathy-gtk/empathy-account-widget.c
trunk/libempathy-gtk/empathy-account-widget.h
trunk/libempathy-gtk/empathy-accounts-dialog.c
Modified: trunk/data/aim.profile
==============================================================================
--- trunk/data/aim.profile (original)
+++ trunk/data/aim.profile Wed Apr 2 13:56:23 2008
@@ -3,7 +3,7 @@
Protocol=aim
IconName = im-aim
DisplayName=AIM
-ConfigurationUI = haze
+ConfigurationUI = aim
Capabilities = chat-p2p, supports-alias, supports-avatars, supports-roster
VCardDefault = 1
VCardField = X-AIM
Modified: trunk/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/libempathy-gtk/Makefile.am (original)
+++ trunk/libempathy-gtk/Makefile.am Wed Apr 2 13:56:23 2008
@@ -112,6 +112,7 @@
empathy-account-widget-icq.glade \
empathy-account-widget-yahoo.glade \
empathy-account-widget-groupwise.glade \
+ empathy-account-widget-aim.glade \
empathy-spell-dialog.glade \
empathy-log-window.glade \
empathy-chat.glade \
Added: trunk/libempathy-gtk/empathy-account-widget-aim.glade
==============================================================================
--- (empty file)
+++ trunk/libempathy-gtk/empathy-account-widget-aim.glade Wed Apr 2 13:56:23 2008
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
+<glade-interface>
+ <widget class="GtkWindow" id="account_aim_settings">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">ICQ account settings</property>
+ <property name="resizable">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox_aim_settings">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkTable" id="table_common_settings">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label_password">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Pass_word:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_password</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_screenname">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Screen _Name:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_uin</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_forget">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="tooltip" translatable="yes">Forget password and clear the entry.</property>
+ <property name="response_id">0</property>
+ <child>
+ <widget class="GtkImage" id="image834">
+ <property name="visible">True</property>
+ <property name="stock">gtk-clear</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_uin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">*</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkExpander" id="expander1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <widget class="GtkTable" id="table_advanced_settings">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <widget class="GtkSpinButton" id="spinbutton_port">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">5222 0 65556 1 10 10</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_port">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Port:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">spinbutton_port</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry_server">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_server">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Server:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_server</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Advanced</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
Modified: trunk/libempathy-gtk/empathy-account-widget.c
==============================================================================
--- trunk/libempathy-gtk/empathy-account-widget.c (original)
+++ trunk/libempathy-gtk/empathy-account-widget.c Wed Apr 2 13:56:23 2008
@@ -671,6 +671,42 @@
}
GtkWidget *
+empathy_account_widget_aim_new (McAccount *account)
+{
+ GladeXML *glade;
+ GtkWidget *widget;
+ GtkWidget *spinbutton_port;
+ gchar *filename;
+
+ filename = empathy_file_lookup ("empathy-account-widget-aim.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_aim_settings",
+ NULL,
+ "vbox_aim_settings", &widget,
+ "spinbutton_port", &spinbutton_port,
+ NULL);
+ g_free (filename);
+
+ empathy_account_widget_handle_params (account, glade,
+ "entry_screenname", "account",
+ "entry_password", "password",
+ "entry_server", "server",
+ "spinbutton_port", "port",
+ NULL);
+
+ empathy_account_widget_add_forget_button (account, glade,
+ "button_forget",
+ "entry_password");
+
+ g_object_unref (glade);
+
+ gtk_widget_show (widget);
+
+ return widget;
+}
+
+GtkWidget *
empathy_account_widget_yahoo_new (McAccount *account)
{
GladeXML *glade;
Modified: trunk/libempathy-gtk/empathy-account-widget.h
==============================================================================
--- trunk/libempathy-gtk/empathy-account-widget.h (original)
+++ trunk/libempathy-gtk/empathy-account-widget.h Wed Apr 2 13:56:23 2008
@@ -45,6 +45,7 @@
GtkWidget *empathy_account_widget_msn_new (McAccount *account);
GtkWidget *empathy_account_widget_jabber_new (McAccount *account);
GtkWidget *empathy_account_widget_icq_new (McAccount *account);
+GtkWidget *empathy_account_widget_aim_new (McAccount *account);
GtkWidget *empathy_account_widget_yahoo_new (McAccount *account);
GtkWidget *empathy_account_widget_sip_new (McAccount *account);
GtkWidget *empathy_account_widget_groupwise_new (McAccount *account);
Modified: trunk/libempathy-gtk/empathy-accounts-dialog.c
==============================================================================
--- trunk/libempathy-gtk/empathy-accounts-dialog.c (original)
+++ trunk/libempathy-gtk/empathy-accounts-dialog.c Wed Apr 2 13:56:23 2008
@@ -277,6 +277,10 @@
dialog->settings_widget =
empathy_account_widget_icq_new (account);
}
+ else if (!tp_strdiff(config_ui, "aim")) {
+ dialog->settings_widget =
+ empathy_account_widget_aim_new (account);
+ }
else if (!tp_strdiff (config_ui, "yahoo")) {
dialog->settings_widget =
empathy_account_widget_yahoo_new (account);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
