*/
#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include <widgets/modest-account-view-window.h>
+#include <widgets/modest-account-view.h>
+
#include <modest-runtime.h>
#include <modest-account-mgr-helpers.h>
#include <string.h>
-#include "modest-account-view-window.h"
#include "modest-account-assistant.h"
#include "modest-tny-platform-factory.h"
LAST_SIGNAL
};
-
typedef struct _ModestAccountViewWindowPrivate ModestAccountViewWindowPrivate;
struct _ModestAccountViewWindowPrivate {
- ModestWidgetFactory *widget_factory;
GtkWidget *add_button;
GtkWidget *edit_button;
GtkWidget *remove_button;
gobject_class->finalize = modest_account_view_window_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestAccountViewWindowPrivate));
-
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
}
static void
modest_account_view_window_init (ModestAccountViewWindow *obj)
{
- ModestAccountViewWindowPrivate *priv;
-
- priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
-
- priv->widget_factory = NULL;
+ /* empty */
}
static void
modest_account_view_window_finalize (GObject *obj)
{
- ModestAccountViewWindowPrivate *priv;
-
- priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
-
- if (priv->widget_factory) {
- g_object_unref (G_OBJECT(priv->widget_factory));
- priv->widget_factory = NULL;
- }
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
GtkTreeModel *model;
GtkTreeIter iter;
gboolean has_selection;
- const gchar *account_name;
+ gchar *account_name;
gchar *default_account_name;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
gtk_widget_set_sensitive (priv->default_button,
default_account_name == NULL || account_name == NULL ||
strcmp (default_account_name, account_name) != 0);
+ g_free (account_name);
g_free (default_account_name);
}
{
ModestAccountViewWindowPrivate *priv;
ModestAccountMgr *account_mgr;
- const gchar *account_name;
+ gchar *account_name;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
if (account_name) {
gboolean removed;
- GError *err = NULL;
GtkWidget *dialog;
gchar *txt;
txt = g_strdup_printf (_("Do you really want to delete the account %s?"), account_name);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox),
gtk_label_new (txt), FALSE, FALSE, 0);
- gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
+/* gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); */
g_free (txt);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
the account from the ModestAccountView */
removed = modest_account_mgr_remove_account (account_mgr,
account_name,
- FALSE,
- &err);
+ FALSE);
if (removed) {
/* Show confirmation dialog ??? */
} else {
/* Show error dialog ??? */
- if (err)
- g_error_free (err);
+ g_warning ("Error removing account %s", account_name);
}
}
gtk_widget_destroy (dialog);
+ g_free (account_name);
}
}
ModestAccountViewWindowPrivate *priv;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
- assistant = modest_account_assistant_new (modest_runtime_get_account_mgr(),
- priv->widget_factory);
+ assistant = modest_account_assistant_new (modest_runtime_get_account_mgr());
gtk_window_set_transient_for (GTK_WINDOW(assistant),
GTK_WINDOW(self));
{
ModestAccountViewWindowPrivate *priv;
ModestAccountMgr *account_mgr;
- const gchar *account_name;
+ gchar *account_name;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
account_name = modest_account_view_get_selected_account (priv->account_view);
modest_account_mgr_set_default_account (account_mgr, account_name);
+
+ g_free (account_name);
}
GtkWidget *main_hbox, *main_vbox, *button_box;
GtkWidget *close_button;
GtkWidget *close_hbox;
- ModestAccountView *account_view;
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
main_vbox = gtk_vbox_new (FALSE, 6);
main_hbox = gtk_hbox_new (FALSE, 6);
- account_view = modest_widget_factory_get_account_view (priv->widget_factory);
- priv->account_view = account_view;
- gtk_widget_set_size_request (GTK_WIDGET(account_view), 300, 400);
+ priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
+ gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), 300, 400);
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(account_view));
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
g_signal_connect (G_OBJECT(sel), "changed", G_CALLBACK(on_selection_changed),
self);
button_box = button_box_new (self);
- gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(account_view), TRUE, TRUE, 2);
+ gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(priv->account_view), TRUE, TRUE, 2);
gtk_box_pack_start (GTK_BOX(main_hbox), button_box, FALSE, FALSE,2);
gtk_box_pack_start (GTK_BOX(main_vbox), main_hbox, TRUE, TRUE, 2);
GtkWidget*
-modest_account_view_window_new (ModestWidgetFactory *factory)
+modest_account_view_window_new (void)
{
GObject *obj;
ModestAccountViewWindowPrivate *priv;
-
- g_return_val_if_fail (factory, NULL);
obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW_WINDOW, NULL);
priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(obj);
- g_object_ref (G_OBJECT(factory));
- priv->widget_factory = factory;
-
gtk_window_set_resizable (GTK_WINDOW(obj), FALSE);
-
gtk_window_set_title (GTK_WINDOW(obj), _("Accounts"));
gtk_window_set_type_hint (GTK_WINDOW(obj), GDK_WINDOW_TYPE_HINT_DIALOG);
projects / modest / blobdiff