MC should migrate butterfly accounts. If it fails (typically because Haze
isn't installed) then it disables the account. There is no point allowing user
to re-enable it as it won't work properly with Empathy any way.
https://bugzilla.gnome.org/show_bug.cgi?id=663829
gboolean account_enabled;
gboolean creating_account;
TpStorageRestrictionFlags storage_restrictions = 0;
gboolean account_enabled;
gboolean creating_account;
TpStorageRestrictionFlags storage_restrictions = 0;
+ gboolean display_switch = TRUE;
view = GTK_TREE_VIEW (priv->treeview);
selection = gtk_tree_view_get_selection (view);
view = GTK_TREE_VIEW (priv->treeview);
selection = gtk_tree_view_get_selection (view);
presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
storage_restrictions = tp_account_get_storage_restrictions (account);
presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
storage_restrictions = tp_account_get_storage_restrictions (account);
+ if (storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED)
+ display_switch = FALSE;
+
+ /* Butterfly accounts shouldn't be used any more */
+ if (!tp_strdiff (tp_account_get_connection_manager (account),
+ "butterfly"))
+ display_switch = FALSE;
accounts_dialog_enable_switch_active_cb, dialog);
/* Display the Enable switch if account supports it */
accounts_dialog_enable_switch_active_cb, dialog);
/* Display the Enable switch if account supports it */
- gtk_widget_set_visible (priv->enabled_switch,
- !(storage_restrictions & TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED));
+ gtk_widget_set_visible (priv->enabled_switch, display_switch);