empathy r869 - in branches/gnome-2-22: data libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Apr  4 13:02:18 2008
New Revision: 869
URL: http://svn.gnome.org/viewvc/empathy?rev=869&view=rev

Log:
Import SIP profiles/widget from git stable


Modified:
   branches/gnome-2-22/data/Makefile.am
   branches/gnome-2-22/libempathy-gtk/Makefile.am
   branches/gnome-2-22/libempathy-gtk/empathy-account-widget.c
   branches/gnome-2-22/libempathy-gtk/empathy-account-widget.h
   branches/gnome-2-22/libempathy-gtk/empathy-accounts-dialog.c

Modified: branches/gnome-2-22/data/Makefile.am
==============================================================================
--- branches/gnome-2-22/data/Makefile.am	(original)
+++ branches/gnome-2-22/data/Makefile.am	Fri Apr  4 13:02:18 2008
@@ -11,7 +11,10 @@
 	irc.profile			\
 	msn.profile			\
 	msn-haze.profile		\
-	sofiasip.profile
+	sofiasip.profile		\
+	ekiga.profile			\
+	fwd.profile			\
+	sipphone.profile
 
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = empathy.desktop.in

Modified: branches/gnome-2-22/libempathy-gtk/Makefile.am
==============================================================================
--- branches/gnome-2-22/libempathy-gtk/Makefile.am	(original)
+++ branches/gnome-2-22/libempathy-gtk/Makefile.am	Fri Apr  4 13:02:18 2008
@@ -130,6 +130,7 @@
 	empathy-account-widget-generic.glade	\
 	empathy-account-widget-jabber.glade	\
 	empathy-account-widget-msn.glade	\
+	empathy-account-widget-sip.glade	\
 	empathy-account-widget-salut.glade	\
 	empathy-account-widget-irc.glade	\
 	empathy-account-widget-icq.glade	\

Modified: branches/gnome-2-22/libempathy-gtk/empathy-account-widget.c
==============================================================================
--- branches/gnome-2-22/libempathy-gtk/empathy-account-widget.c	(original)
+++ branches/gnome-2-22/libempathy-gtk/empathy-account-widget.c	Fri Apr  4 13:02:18 2008
@@ -525,6 +525,49 @@
 }
 
 GtkWidget *
+empathy_account_widget_sip_new (McAccount *account)
+{
+	GladeXML  *glade;
+	GtkWidget *widget;
+
+	glade = empathy_glade_get_file ("empathy-account-widget-sip.glade",
+					"vbox_sip_settings",
+					NULL,
+					"vbox_sip_settings", &widget,
+					NULL);
+
+	empathy_account_widget_handle_params (account, glade,
+		"entry_userid", "account",
+		"entry_password", "password",
+		"entry_registar", "registar",
+		"entry_proxy","proxy-host",
+		"spinbutton_port", "port",
+		"entry_transport", "transport",
+		"checkbutton_discover-binding","discover-binding",
+		"entry_keepalive-mechanism", "keepalive-mechanism",
+		"entry_keepalive-interval", "keepalive-interval",
+		"checkbutton_discover-stun", "discover-stun",
+		"entry_stun-server", "stun-server",
+		"spinbutton_stun-port", "stun-port",
+		"entry_local-ip", "local-ip-address",
+		"spinbutton_local-port", "local-port",
+		"entry_extra-auth-user", "extra-auth-user",
+		"entry_extra-auth-password", "extra-auth-password",
+		"checkbutton_avoid-difficult", "avoid-difficult",
+		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_jabber_new (McAccount *account)
 {
 	GladeXML  *glade;

Modified: branches/gnome-2-22/libempathy-gtk/empathy-account-widget.h
==============================================================================
--- branches/gnome-2-22/libempathy-gtk/empathy-account-widget.h	(original)
+++ branches/gnome-2-22/libempathy-gtk/empathy-account-widget.h	Fri Apr  4 13:02:18 2008
@@ -46,6 +46,7 @@
 GtkWidget *empathy_account_widget_jabber_new        (McAccount   *account);
 GtkWidget *empathy_account_widget_icq_new           (McAccount   *account);
 GtkWidget *empathy_account_widget_yahoo_new         (McAccount   *account);
+GtkWidget *empathy_account_widget_sip_new	    (McAccount   *account);
 
 G_END_DECLS
 

Modified: branches/gnome-2-22/libempathy-gtk/empathy-accounts-dialog.c
==============================================================================
--- branches/gnome-2-22/libempathy-gtk/empathy-accounts-dialog.c	(original)
+++ branches/gnome-2-22/libempathy-gtk/empathy-accounts-dialog.c	Fri Apr  4 13:02:18 2008
@@ -282,6 +282,10 @@
 			dialog->settings_widget =
 				empathy_account_widget_yahoo_new (account);
 		}
+		else if  (!tp_strdiff (config_ui, "sofiasip")) {
+			dialog->settings_widget =
+				empathy_account_widget_sip_new (account);
+		}
 		else {
 			dialog->settings_widget = 
 				empathy_account_widget_generic_new (account);