diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 172 | ||||
| -rw-r--r-- | libempathy/empathy-account-settings.c | 9 |
3 files changed, 155 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 6b4b9a071..21fb15966 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ KEYRING_REQUIRED=2.26.0 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.5.1 TELEPATHY_FARSIGHT_REQUIRED=0.0.14 -TELEPATHY_GLIB_REQUIRED=0.11.16 +TELEPATHY_GLIB_REQUIRED=0.13.1.1 TELEPATHY_LOGGER=0.1.5 UNIQUE_REQUIRED=1.1.2 @@ -389,6 +389,7 @@ if test "x$enable_meego" != "xno"; then PKG_CHECK_MODULES(MEEGO, [ mx-gtk-1.0 + gio-unix-2.0 ], have_meego="yes", have_meego="no") if test "x$have_meego" = "xyes"; then diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index f59507904..0bb918e1a 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -33,6 +33,7 @@ #ifdef HAVE_MEEGO #include <mx-gtk/mx-gtk.h> #endif /* HAVE_MEEGO */ +#include <gio/gdesktopappinfo.h> #include <libempathy/empathy-utils.h> @@ -111,6 +112,10 @@ enum { static void account_widget_apply_and_log_in (EmpathyAccountWidget *); +enum { + RESPONSE_LAUNCH +}; + static guint signals[LAST_SIGNAL] = { 0 }; #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountWidget) @@ -1013,6 +1018,100 @@ account_widget_build_generic (EmpathyAccountWidget *self, } static void +account_widget_launch_external_clicked (GtkWidget *button, + TpAccount *account) +{ + if (!tp_strdiff (tp_account_get_storage_provider (account), + "com.meego.libsocialweb")) + { + /* we know how to handle this external provider */ + GDesktopAppInfo *app_info; + const gchar *args[3] = { NULL, }; + GError *error = NULL; + + app_info = g_desktop_app_info_new ("gnome-control-center.desktop"); + + if (app_info == NULL) + { + g_critical ("Could not locate 'gnome-control-center.desktop'"); + return; + } + + args[0] = g_app_info_get_commandline (G_APP_INFO (app_info)); + args[1] = "bisho.desktop"; + args[2] = NULL; + + gdk_spawn_on_screen (gtk_widget_get_screen (button), + NULL, (gchar **) args, NULL, + G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error); + if (error != NULL) + { + g_critical ("Failed to launch editor: %s", error->message); + g_clear_error (&error); + } + + g_object_unref (app_info); + } +} + +static void +account_widget_build_external (EmpathyAccountWidget *self, + EmpathyAccountSettings *settings) +{ + EmpathyAccountWidgetPriv *priv = GET_PRIV (self); + TpAccount *account = empathy_account_settings_get_account (settings); + GtkWidget *bar, *widget; + gchar *str; + + self->ui_details->widget = gtk_vbox_new (FALSE, 6); + priv->table_common_settings = gtk_table_new (1, 2, FALSE); + + if (!tp_strdiff (tp_account_get_storage_provider (account), + "com.meego.libsocialweb")) + { + /* we know how to handle this external provider */ + str = g_strdup_printf ( + _("The account %s is edited via My Web Accounts."), + empathy_account_settings_get_display_name (settings)); + } + else + { + str = g_strdup_printf ( + _("The account %s cannot be edited in Empathy."), + empathy_account_settings_get_display_name (settings)); + } + + widget = gtk_label_new (str); + gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE); + g_free (str); + + bar = gtk_info_bar_new (); + gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO); + gtk_container_add ( + GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), + widget); + gtk_container_set_border_width (GTK_CONTAINER (bar), 6); + + if (!tp_strdiff (tp_account_get_storage_provider (account), + "com.meego.libsocialweb")) + { + /* we know how to handle this external provider */ + widget = gtk_info_bar_add_button (GTK_INFO_BAR (bar), + _("Launch My Web Accounts"), RESPONSE_LAUNCH); + + g_signal_connect (widget, "clicked", + G_CALLBACK (account_widget_launch_external_clicked), account); + } + + gtk_box_pack_start (GTK_BOX (self->ui_details->widget), bar, + FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (self->ui_details->widget), + priv->table_common_settings, FALSE, TRUE, 0); + + gtk_widget_show_all (self->ui_details->widget); +} + +static void account_widget_build_salut (EmpathyAccountWidget *self, const char *filename) { @@ -1823,7 +1922,6 @@ do_constructed (GObject *obj) EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj); EmpathyAccountWidgetPriv *priv = GET_PRIV (self); TpAccount *account; - const gchar *protocol, *cm_name; const gchar *display_name, *default_display_name; guint i = 0; struct { @@ -1844,31 +1942,46 @@ do_constructed (GObject *obj) WIDGET (sofiasip, sip), }; - cm_name = empathy_account_settings_get_cm (priv->settings); - protocol = empathy_account_settings_get_protocol (priv->settings); + account = empathy_account_settings_get_account (priv->settings); + + /* Empathy can only edit accounts without the Cannot_Set_Parameters flag */ + if (tp_account_get_storage_restrictions (account) & + TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS) + { + DEBUG ("Account is provided by an external storage provider"); - for (i = 0 ; i < G_N_ELEMENTS (widgets); i++) + account_widget_build_external (self, priv->settings); + } + else { - if (!tp_strdiff (widgets[i].cm_name, cm_name) && - !tp_strdiff (widgets[i].protocol, protocol)) + const gchar *protocol, *cm_name; + + cm_name = empathy_account_settings_get_cm (priv->settings); + protocol = empathy_account_settings_get_protocol (priv->settings); + + for (i = 0 ; i < G_N_ELEMENTS (widgets); i++) { - gchar *filename; + if (!tp_strdiff (widgets[i].cm_name, cm_name) && + !tp_strdiff (widgets[i].protocol, protocol)) + { + gchar *filename; - filename = empathy_file_lookup (widgets[i].file, - "libempathy-gtk"); - widgets[i].func (self, filename); - g_free (filename); + filename = empathy_file_lookup (widgets[i].file, + "libempathy-gtk"); + widgets[i].func (self, filename); + g_free (filename); - break; + break; + } } - } - if (i == G_N_ELEMENTS (widgets)) - { - gchar *filename = empathy_file_lookup ( - "empathy-account-widget-generic.ui", "libempathy-gtk"); - account_widget_build_generic (self, filename); - g_free (filename); + if (i == G_N_ELEMENTS (widgets)) + { + gchar *filename = empathy_file_lookup ( + "empathy-account-widget-generic.ui", "libempathy-gtk"); + account_widget_build_generic (self, filename); + g_free (filename); + } } /* handle default focus */ @@ -1891,7 +2004,9 @@ do_constructed (GObject *obj) account_manager_ready_cb, self); /* handle apply and cancel button */ - if (!priv->simple) + if (!priv->simple && + !(tp_account_get_storage_restrictions (account) & + TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS)) { GtkWidget *hbox = gtk_hbox_new (TRUE, 3); GtkWidget *image; @@ -1940,8 +2055,6 @@ do_constructed (GObject *obj) account_widget_set_control_buttons_sensitivity (self, FALSE); } - account = empathy_account_settings_get_account (priv->settings); - if (account != NULL) { g_signal_connect (account, "notify::enabled", @@ -1951,15 +2064,22 @@ do_constructed (GObject *obj) #ifndef HAVE_MEEGO add_register_buttons (self, account); #endif /* HAVE_MEEGO */ - add_enable_checkbox (self, account); + + /* add the Enable checkbox to accounts that support it */ + if (!(tp_account_get_storage_restrictions (account) & + TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED)) + add_enable_checkbox (self, account); /* hook up to widget destruction to unref ourselves */ g_signal_connect (self->ui_details->widget, "destroy", G_CALLBACK (account_widget_destroy_cb), self); - empathy_builder_unref_and_keep_widget (self->ui_details->gui, - self->ui_details->widget); - self->ui_details->gui = NULL; + if (self->ui_details->gui != NULL) + { + empathy_builder_unref_and_keep_widget (self->ui_details->gui, + self->ui_details->widget); + self->ui_details->gui = NULL; + } display_name = empathy_account_settings_get_display_name (priv->settings); default_display_name = empathy_account_widget_get_default_display_name (self); diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 1e63aede9..e5191a96c 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -221,7 +221,12 @@ empathy_account_settings_constructed (GObject *object) if (!priv->ready) { - tp_account_prepare_async (priv->account, NULL, + GQuark features[] = { + TP_ACCOUNT_FEATURE_CORE, + TP_ACCOUNT_FEATURE_STORAGE, + 0 }; + + tp_proxy_prepare_async (priv->account, features, empathy_account_settings_account_ready_cb, self); tp_g_signal_connect_object (priv->managers, "notify::ready", G_CALLBACK (empathy_account_settings_managers_ready_cb), object, 0); @@ -450,7 +455,7 @@ empathy_account_settings_account_ready_cb (GObject *source_object, TpAccount *account = TP_ACCOUNT (source_object); GError *error = NULL; - if (!tp_account_prepare_finish (account, result, &error)) + if (!tp_proxy_prepare_finish (account, result, &error)) { DEBUG ("Failed to prepare account: %s", error->message); g_error_free (error); |