X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=9bb6f3ff92b063421ace74f8cbdf52ed0d10ef33;hp=459df2bca28e52babbf1fce51d2df555cf703367;hb=362784ce756b3f0e31cd451d9ac5e69b909d4053;hpb=dece14f7b4b809b774150979c3748ca77b329863
diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 459df2b..9bb6f3f 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -78,16 +78,21 @@
#define YSPACE 0
/* 'private'/'protected' functions */
-static void modest_main_window_class_init (ModestMainWindowClass *klass);
-static void modest_main_window_init (ModestMainWindow *obj);
-static void modest_main_window_finalize (GObject *obj);
+static void modest_main_window_class_init (ModestMainWindowClass *klass);
+static void modest_main_window_init (ModestMainWindow *obj);
+static void modest_main_window_finalize (GObject *obj);
+
static gboolean modest_main_window_window_state_event (GtkWidget *widget,
GdkEventWindowState *event,
gpointer userdata);
static void connect_signals (ModestMainWindow *self);
-static void restore_settings (ModestMainWindow *self, gboolean do_folder_view_too);
+static void modest_main_window_disconnect_signals (ModestWindow *self);
+
+static void restore_settings (ModestMainWindow *self,
+ gboolean do_folder_view_too);
+
static void save_state (ModestWindow *self);
static void modest_main_window_show_toolbar (ModestWindow *window,
@@ -96,14 +101,14 @@ static void modest_main_window_show_toolbar (ModestWindow *window,
static void cancel_progressbar (GtkToolButton *toolbutton,
ModestMainWindow *self);
-static void on_queue_changed (ModestMailOperationQueue *queue,
- ModestMailOperation *mail_op,
- ModestMailOperationQueueNotification type,
- ModestMainWindow *self);
+static void on_queue_changed (ModestMailOperationQueue *queue,
+ ModestMailOperation *mail_op,
+ ModestMailOperationQueueNotification type,
+ ModestMainWindow *self);
static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
-static void on_account_update (TnyAccountStore *account_store,
+static void account_number_changed (TnyAccountStore *account_store,
const gchar *account_name,
gpointer user_data);
@@ -113,7 +118,8 @@ static gboolean on_inner_widgets_key_pressed (GtkWidget *widget,
static void on_configuration_key_changed (ModestConf* conf,
const gchar *key,
- ModestConfEvent event,
+ ModestConfEvent event,
+ ModestConfNotificationId id,
ModestMainWindow *self);
static void set_toolbar_mode (ModestMainWindow *self,
@@ -172,8 +178,8 @@ struct _ModestMainWindowPrivate {
GtkWidget *empty_view;
/* Progress observers */
- GtkWidget *progress_bar;
- GSList *progress_widgets;
+ GtkWidget *progress_bar;
+ GSList *progress_widgets;
/* Tollbar items */
GtkWidget *progress_toolitem;
@@ -206,6 +212,8 @@ struct _ModestMainWindowPrivate {
/* Signal handler UIDs */
gint queue_changed_handler_uid;
GList *queue_err_signals;
+
+ ModestConfNotificationId notification_id;
};
#define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_MAIN_WINDOW, \
@@ -299,6 +307,7 @@ modest_main_window_class_init (ModestMainWindowClass *klass)
modest_window_class->save_state_func = save_state;
modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
+ modest_window_class->disconnect_signals_func = modest_main_window_disconnect_signals;
}
static void
@@ -337,6 +346,10 @@ modest_main_window_finalize (GObject *obj)
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
+ /* Sanity check: shouldn't be needed, the window mgr should
+ call this function before */
+ modest_main_window_disconnect_signals (MODEST_WINDOW (obj));
+
modest_main_window_cleanup_queue_error_signals ((ModestMainWindow *) obj);
g_slist_free (priv->progress_widgets);
@@ -348,10 +361,11 @@ modest_main_window_finalize (GObject *obj)
priv->progress_bar_timeout = 0;
}
- /* Disconnect signal handlers */
- if (priv->queue_changed_handler_uid)
- g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (),
- priv->queue_changed_handler_uid);
+ if (priv->notification_id) {
+ modest_conf_forget_namespace (modest_runtime_get_conf (),
+ MODEST_CONF_NAMESPACE,
+ priv->notification_id);
+ }
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
@@ -385,6 +399,8 @@ modest_main_window_get_child_widget (ModestMainWindow *self,
static void
restore_settings (ModestMainWindow *self, gboolean do_folder_view_too)
{
+ printf ("DEBUGDEBUG: %s\n", __FUNCTION__);
+
ModestConf *conf;
ModestMainWindowPrivate *priv;
@@ -450,69 +466,71 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
/* return FALSE; */
/* } */
-static void
-on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data)
-{
- if (err) {
- printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message);
+/* static void */
+/* on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) */
+/* { */
+/* if (err) { */
+/* printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message); */
- if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL)
- /* Don't show waste the user's time by showing him a dialog telling him
- * that he has just cancelled something: */
- return;
- }
+/* if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL) */
+/* /\* Don't show waste the user's time by showing him a dialog telling him */
+/* * that he has just cancelled something: *\/ */
+/* return; */
+/* } */
- /* Get the server name: */
- const gchar* server_name = NULL;
+/* /\* Get the server name: *\/ */
+/* const gchar* server_name = NULL; */
- TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account (
- TNY_CAMEL_SEND_QUEUE (self));
- if (server_account) {
- server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account));
+/* TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account ( */
+/* TNY_CAMEL_SEND_QUEUE (self)); */
+/* if (server_account) { */
+/* server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); */
- g_object_unref (server_account);
- server_account = NULL;
- }
+/* g_object_unref (server_account); */
+/* server_account = NULL; */
+/* } */
- if (!server_name)
- server_name = _("Unknown Server");
-
- /* Show the appropriate message text for the GError: */
- gchar *message = NULL;
- if (err) {
- switch (err->code) {
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED:
- message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
- break;
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE:
- message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
- break;
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED:
- /* TODO: This logical ID seems more suitable for a wrong username or password than for a
- * wrong authentication method. The user is unlikely to guess at the real cause.
- */
- message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name);
- break;
- case TNY_TRANSPORT_ACCOUNT_ERROR_SEND:
- default:
- message = g_strdup (_("emev_ib_ui_smtp_send_error"));
- break;
- }
- } else {
- message = g_strdup (_("emev_ib_ui_smtp_send_error"));
- }
+/* if (!server_name) */
+/* server_name = _("Unknown Server"); */
+
+/* /\* Show the appropriate message text for the GError: *\/ */
+/* gchar *message = NULL; */
+/* if (err) { */
+/* switch (err->code) { */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: */
+/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */
+/* break; */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE: */
+/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */
+/* break; */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED: */
+/* /\* TODO: This logical ID seems more suitable for a wrong username or password than for a */
+/* * wrong authentication method. The user is unlikely to guess at the real cause. */
+/* *\/ */
+/* message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name); */
+/* break; */
+/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: */
+/* /\* TODO: Tinymail is still sending this sometimes when it should */
+/* * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. *\/ */
+/* default: */
+/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */
+/* break; */
+/* } */
+/* } else { */
+/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */
+/* } */
- modest_maemo_show_information_note_and_forget (GTK_WINDOW (user_data), message);
- g_free (message);
+/* modest_maemo_show_information_note_and_forget (GTK_WINDOW (user_data), message); */
+/* g_free (message); */
- /* TODO: Offer to remove the message, to avoid messages in future? */
- /*
- TnyFolder *outbox = tny_send_queue_get_outbox (queue);
- tny_folder_remove_msg (outbox, header, NULL);
- tny_folder_sync (outbox, TRUE, NULL);
- g_object_unref (outbox);
- */
-}
+/* /\* TODO: Offer to remove the message, to avoid messages in future? *\/ */
+/* /\* */
+/* TnyFolder *outbox = tny_send_queue_get_outbox (queue); */
+/* tny_folder_remove_msg (outbox, header, NULL); */
+/* tny_folder_sync (outbox, TRUE, NULL); */
+/* g_object_unref (outbox); */
+/* *\/ */
+/* } */
typedef struct {
TnySendQueue *queue;
@@ -535,71 +553,71 @@ modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self)
priv->queue_err_signals = NULL;
}
-static void
-on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self)
-{
- ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+/* static void */
+/* on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) */
+/* { */
+/* ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); */
- /* When going online, do the equivalent of pressing the send/receive button,
- * as per the specification:
- * (without the check for >0 accounts, though that is not specified): */
+/* /\* When going online, do the equivalent of pressing the send/receive button, */
+/* * as per the specification: */
+/* * (without the check for >0 accounts, though that is not specified): *\/ */
- TnyDevice *device = tny_account_store_get_device (store);
+/* TnyDevice *device = tny_account_store_get_device (store); */
- /* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); */
+/* /\* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); *\/ */
- /* Check that we are really online.
- * This signal should not be emitted when we are not connected,
- * but it seems to happen sometimes: */
- if (!tny_device_is_online (device))
- return;
+/* /\* Check that we are really online. */
+/* * This signal should not be emitted when we are not connected, */
+/* * but it seems to happen sometimes: *\/ */
+/* if (!tny_device_is_online (device)) */
+/* return; */
- const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
- printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id);
+/* const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device)); */
+/* printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id); */
- /* Stop the existing send queues: */
- modest_runtime_remove_all_send_queues ();
+/* /\* Stop the existing send queues: *\/ */
+/* modest_runtime_remove_all_send_queues (); */
- /* Create the send queues again, using the appropriate transport accounts
- * for this new connection.
- * This could be the first time that they are created if this is the first
- * connection. */
- /* TODO: Does this really destroy the TnySendQueues and their threads
- * We do not want 2 TnySendQueues to exist with the same underlying
- * outbox directory. */
-
- modest_main_window_cleanup_queue_error_signals (self);
-
- GSList *account_names = modest_account_mgr_account_names (
- modest_runtime_get_account_mgr(),
- TRUE /* enabled accounts only */);
- GSList *iter = account_names;
- while (iter) {
- const gchar *account_name = (const gchar*)(iter->data);
- if (account_name) {
- TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT (
- modest_tny_account_store_get_transport_account_for_open_connection
- (modest_runtime_get_account_store(), account_name));
- if (account) {
- /* Q: Is this the first location where the send-queues are requested? */
- QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal);
- printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name,
- tny_account_get_id(TNY_ACCOUNT(account)));
- esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account));
- esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened",
- G_CALLBACK (on_sendqueue_error_happened), self);
- priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal);
- }
- }
+/* /\* Create the send queues again, using the appropriate transport accounts */
+/* * for this new connection. */
+/* * This could be the first time that they are created if this is the first */
+/* * connection. *\/ */
+/* /\* TODO: Does this really destroy the TnySendQueues and their threads */
+/* * We do not want 2 TnySendQueues to exist with the same underlying */
+/* * outbox directory. *\/ */
+
+/* modest_main_window_cleanup_queue_error_signals (self); */
+
+/* GSList *account_names = modest_account_mgr_account_names ( */
+/* modest_runtime_get_account_mgr(), */
+/* TRUE /\* enabled accounts only *\/); */
+/* GSList *iter = account_names; */
+/* while (iter) { */
+/* const gchar *account_name = (const gchar*)(iter->data); */
+/* if (account_name) { */
+/* TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT ( */
+/* modest_tny_account_store_get_transport_account_for_open_connection */
+/* (modest_runtime_get_account_store(), account_name)); */
+/* if (account) { */
+/* /\* Q: Is this the first location where the send-queues are requested? *\/ */
+/* QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal); */
+/* printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name, */
+/* tny_account_get_id(TNY_ACCOUNT(account))); */
+/* esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account)); */
+/* esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened", */
+/* G_CALLBACK (on_sendqueue_error_happened), self); */
+/* priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal); */
+/* } */
+/* } */
- iter = g_slist_next (iter);
- }
+/* iter = g_slist_next (iter); */
+/* } */
- modest_account_mgr_free_account_names (account_names);
- account_names = NULL;
+/* modest_account_mgr_free_account_names (account_names); */
+/* account_names = NULL; */
- modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self));
-}
+/* modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); */
+/* } */
static void
_folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
@@ -622,6 +640,20 @@ _header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
}
static void
+modest_main_window_disconnect_signals (ModestWindow *self)
+{
+ ModestMainWindowPrivate *priv;
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ /* Disconnect signal handlers */
+ if (g_signal_handler_is_connected (modest_runtime_get_mail_operation_queue (),
+ priv->queue_changed_handler_uid))
+ g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (),
+ priv->queue_changed_handler_uid);
+}
+
+static void
connect_signals (ModestMainWindow *self)
{
ModestWindowPrivate *parent_priv;
@@ -669,7 +701,6 @@ connect_signals (ModestMainWindow *self)
self);
/* window */
-/* g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); */
g_signal_connect (G_OBJECT (self), "window-state-event",
G_CALLBACK (modest_main_window_window_state_event),
NULL);
@@ -680,13 +711,18 @@ connect_signals (ModestMainWindow *self)
"queue-changed", G_CALLBACK (on_queue_changed), self);
/* Track changes in the device name */
+ priv->notification_id = modest_conf_listen_to_namespace (modest_runtime_get_conf (),
+ MODEST_CONF_NAMESPACE);
g_signal_connect (G_OBJECT(modest_runtime_get_conf ()),
"key_changed", G_CALLBACK (on_configuration_key_changed),
self);
/* Track account changes. We need to refresh the toolbar */
g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
- "account_update", G_CALLBACK (on_account_update),
+ "account_inserted", G_CALLBACK (account_number_changed),
+ self);
+ g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+ "account_removed", G_CALLBACK (account_number_changed),
self);
/* Account store */
@@ -694,10 +730,10 @@ connect_signals (ModestMainWindow *self)
"password_requested",
G_CALLBACK (modest_ui_actions_on_password_requested), self);
- /* Device */
- g_signal_connect (G_OBJECT(modest_runtime_get_account_store()),
- "connecting-finished",
- G_CALLBACK(on_account_store_connecting_finished), self);
+/* /\* Device *\/ */
+/* g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), */
+/* "connecting-finished", */
+/* G_CALLBACK(on_account_store_connecting_finished), self); */
}
#if 0
@@ -775,6 +811,12 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
+ /* The UI spec wants us to show a connection dialog when the application is
+ * started by the user, if there is no connection.
+ * Do this before showing the account wizard,
+ * because wizard needs a connection to discover capabilities. */
+ modest_platform_connect_and_wait (GTK_WINDOW (self), NULL);
+
/* Check if accounts exist and show the account wizard if not */
gboolean accounts_exist =
modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
@@ -791,11 +833,9 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
- gtk_action_set_visible (send_receive_all, g_slist_length (accounts));
+ gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 1);
modest_account_mgr_free_account_names (accounts);
}
-
-
}
ModestWindow *
@@ -896,6 +936,7 @@ modest_main_window_new (void)
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL));
hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
+ gtk_widget_show (parent_priv->menubar);
/* Get device name */
modest_maemo_utils_get_device_name ();
@@ -913,9 +954,11 @@ modest_main_window_new (void)
g_object_set (G_OBJECT (priv->header_view),
"rules-hint", FALSE,
NULL);
+ /* gtk_widget_show (priv->header_view); */
/* Empty view */
priv->empty_view = create_empty_view ();
+ gtk_widget_show (priv->empty_view);
/* Create scrolled windows */
folder_win = gtk_scrolled_window_new (NULL, NULL);
@@ -926,6 +969,7 @@ modest_main_window_new (void)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->contents_widget),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
+ /* gtk_widget_show (priv->contents_widget); */
/* paned */
priv->main_paned = gtk_hpaned_new ();
@@ -936,7 +980,8 @@ modest_main_window_new (void)
/* putting it all together... */
priv->main_vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
-
+ gtk_widget_show (priv->main_vbox);
+
gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
HildonProgram *app = hildon_program_get_instance ();
@@ -955,7 +1000,12 @@ modest_main_window_new (void)
g_object_unref (window_icon);
}
- restore_settings (MODEST_MAIN_WINDOW(self), FALSE);
+ /* Dont't restore settings here,
+ * because it requires a gtk_widget_show(),
+ * and we don't want to do that until later,
+ * so that the UI is not visible for non-menu D-Bus activation.
+ */
+ /* restore_settings (MODEST_MAIN_WINDOW(self), FALSE); */
return MODEST_WINDOW(self);
}
@@ -1033,7 +1083,10 @@ modest_main_window_set_style (ModestMainWindow *self,
gtk_window_set_title (GTK_WINDOW(self), tny_header_get_subject (header));
else
gtk_window_set_title (GTK_WINDOW (self), _("mail_va_no_subject"));
- g_object_unref (header);
+
+ if (header)
+ g_object_unref (header);
+
g_object_unref (iterator);
g_object_unref (selection);
}
@@ -1173,7 +1226,7 @@ modest_main_window_show_toolbar (ModestWindow *self,
gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
/* Set send & receive button tap and hold menu */
- on_account_update (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+ account_number_changed (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
NULL, self);
}
@@ -1197,9 +1250,9 @@ compare_display_names (ModestAccountData *a,
}
static void
-on_account_update (TnyAccountStore *account_store,
- const gchar *account_name,
- gpointer user_data)
+account_number_changed (TnyAccountStore *account_store,
+ const gchar *account_name,
+ gpointer user_data)
{
GSList *account_names, *iter, *accounts;
ModestMainWindow *self;
@@ -1314,9 +1367,9 @@ on_account_update (TnyAccountStore *account_store,
/* Create action and add it to the action group. The
action name must be the account name, this way we
could know in the handlers the account to show */
- if(account_data->account_name) {
+ if(account_data && account_data->account_name) {
gchar* item_name, *refresh_action_name;
- guint8 merge_id;
+ guint8 merge_id = 0;
GtkAction *view_account_action, *refresh_account_action;
view_account_action = gtk_action_new (account_data->account_name,
@@ -1337,7 +1390,7 @@ on_account_update (TnyAccountStore *account_store,
account_data->account_name,
GTK_UI_MANAGER_MENUITEM,
FALSE);
-
+
/* Connect the action signal "activate" */
g_signal_connect (G_OBJECT (view_account_action),
"activate",
@@ -1348,6 +1401,7 @@ on_account_update (TnyAccountStore *account_store,
refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL);
refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name,
display_name, NULL, NULL);
+ printf("DEBUG: %s: menu display_name=%s\n", __FUNCTION__, display_name);
gtk_action_group_add_action (action_group, refresh_account_action);
merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
@@ -1372,7 +1426,22 @@ on_account_update (TnyAccountStore *account_store,
CSM. If there is only one account then
it'll be no menu */
if (priv->accounts_popup) {
- item = gtk_menu_item_new_with_label (display_name);
+ GtkWidget *label = gtk_label_new(NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ if (default_account && (strcmp(account_data->account_name, default_account) == 0))
+ {
+ gchar *escaped = g_markup_printf_escaped ("%s", display_name);
+ gtk_label_set_markup (GTK_LABEL (label), escaped);
+ g_free (escaped);
+ }
+ else
+ {
+ gtk_label_set_text (GTK_LABEL (label), display_name);
+ }
+
+ item = gtk_menu_item_new ();
+ gtk_container_add (GTK_CONTAINER (item), label);
+
gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
g_signal_connect_data (G_OBJECT (item),
"activate",
@@ -1386,10 +1455,54 @@ on_account_update (TnyAccountStore *account_store,
/* Frees */
g_free (display_name);
- modest_account_mgr_free_account_data (mgr, account_data);
}
+
gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
+ /* We cannot do this in the loop above because this relies on the action
+ * group being inserted. This makes the default account appear in bold.
+ * I agree it is a rather ugly way, but I don't see another possibility. armin. */
+ for (i = 0; i < num_accounts; i++) {
+ ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+
+ if(account_data->account_name && default_account &&
+ strcmp (account_data->account_name, default_account) == 0) {
+ gchar *item_name = g_strconcat (account_data->account_name, "Menu", NULL);
+
+ gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL);
+ GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+ g_free(path);
+
+ if (item) {
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+ if (GTK_IS_LABEL (child)) {
+ const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ gchar *bold_name = g_markup_printf_escaped("%s", cur_name);
+ gtk_label_set_markup (GTK_LABEL (child), bold_name);
+ g_free (bold_name);
+ }
+ }
+
+ path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
+ item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
+ g_free (path);
+
+ if (item) {
+ GtkWidget *child = gtk_bin_get_child (GTK_BIN (item));
+ if (GTK_IS_LABEL (child)) {
+ const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child));
+ gchar *bold_name = g_markup_printf_escaped("%s", cur_name);
+ gtk_label_set_markup (GTK_LABEL (child), bold_name);
+ g_free (bold_name);
+ }
+ }
+
+ g_free(item_name);
+ }
+
+ modest_account_mgr_free_account_data (mgr, account_data);
+ }
+
if (priv->accounts_popup) {
/* Mandatory in order to view the menu contents */
gtk_widget_show_all (priv->accounts_popup);
@@ -1664,11 +1777,13 @@ _on_msg_count_changed (ModestHeaderView *header_view,
{
printf ("DEBUG: %s\n", __FUNCTION__);
gboolean folder_empty = FALSE;
- TnyFolderChangeChanged changed;
+ TnyFolderChangeChanged changed;
+ ModestMainWindowPrivate *priv;
g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
g_return_if_fail (TNY_IS_FOLDER(folder));
g_return_if_fail (TNY_IS_FOLDER_CHANGE(change));
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
changed = tny_folder_change_get_changed (change);
@@ -1684,6 +1799,7 @@ _on_msg_count_changed (ModestHeaderView *header_view,
if (folder_empty) {
modest_main_window_set_contents_style (main_window,
MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
+ gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view));
}
else {
modest_main_window_set_contents_style (main_window,
@@ -1777,17 +1893,18 @@ modest_main_window_get_contents_style (ModestMainWindow *self)
static void
on_configuration_key_changed (ModestConf* conf,
const gchar *key,
- ModestConfEvent event,
+ ModestConfEvent event,
+ ModestConfNotificationId id,
ModestMainWindow *self)
{
- ModestMainWindowPrivate *priv;
+ ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
TnyAccount *account;
- if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME))
+ if (!key ||
+ priv->notification_id != id ||
+ strcmp (key, MODEST_CONF_DEVICE_NAME))
return;
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-
if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS)
return;
@@ -1944,10 +2061,10 @@ cancel_progressbar (GtkToolButton *toolbutton,
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- /* Get operation observers and cancel its current operation */
+ /* Get operation observers and cancel all the operations */
tmp = priv->progress_widgets;
while (tmp) {
- modest_progress_object_cancel_current_operation (MODEST_PROGRESS_OBJECT(tmp->data));
+ modest_progress_object_cancel_all_operations (MODEST_PROGRESS_OBJECT(tmp->data));
tmp=g_slist_next(tmp);
}
}
@@ -2060,7 +2177,7 @@ on_show_account_action_activated (GtkAction *action,
acc_data = modest_account_mgr_get_account_data (mgr, acc_name);
/* Set the new visible & active account */
- if (acc_data->store_account) {
+ if (acc_data && acc_data->store_account) {
modest_folder_view_set_account_id_of_visible_server_account (priv->folder_view,
acc_data->store_account->account_name);
modest_window_set_active_account (MODEST_WINDOW (self), acc_data->account_name);
@@ -2069,7 +2186,8 @@ on_show_account_action_activated (GtkAction *action,
modest_folder_view_select_first_inbox_or_local (priv->folder_view);
/* Free */
- modest_account_mgr_free_account_data (mgr, acc_data);
+ if (acc_data)
+ modest_account_mgr_free_account_data (mgr, acc_data);
}
static void
@@ -2152,7 +2270,9 @@ on_header_view_focus_in (GtkWidget *widget,
else
gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject"));
- g_object_unref (header);
+ if (header)
+ g_object_unref (header);
+
g_object_unref (iterator);
g_object_unref (selection);
}
@@ -2183,7 +2303,7 @@ modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view,
show_reply = show_forward = show_cancel_send = show_clipboard = show_delete = FALSE;
} else if (TNY_IS_FOLDER (folder_store)) {
if (modest_tny_folder_is_local_folder (TNY_FOLDER (folder_store))) {
- TnyFolderType folder_type = modest_tny_folder_get_local_folder_type (
+ TnyFolderType folder_type = modest_tny_folder_get_local_or_mmc_folder_type (
TNY_FOLDER (folder_store));
switch (folder_type) {
case TNY_FOLDER_TYPE_DRAFTS:
@@ -2255,7 +2375,8 @@ modest_main_window_on_msg_view_window_msg_changed (ModestMsgViewWindow *view_win
/* Select the message in the header view */
path = gtk_tree_row_reference_get_path (row_reference);
- _modest_header_view_select_from_path (MODEST_HEADER_VIEW (priv->header_view), path);
+ gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->header_view),
+ path, NULL, FALSE);
gtk_tree_path_free (path);
return TRUE;