+2007-06-12 Murray Cumming <murrayc@murrayc.com>
+
+ * src/modest-account-mgr.c: (on_key_change): Append to the list, not to
+ NULL, so that the signals get all the keys. This should not actually
+ change any behaviour because we currently update everything when anything
+ changes.
+
+2007-06-12 Murray Cumming <murrayc@murrayc.com>
+
+ * src/widgets/modest-folder-view.c: (text_cell_data),
+ (icon_cell_data), (filter_row), (on_selection_changed), (cmp_rows),
+ (find_inbox_iter): If tinymail tells us that the folder is
+ a non-specific TNY_FOLDER_TYPE_NORMAL then do an extra check on the name.
+ This causes the inbox to be selected at startup, fixing part of
+ projects.maemo.org bug NB#56305.
+
+ * src/modest-ui-dimming-rules.c:
+ (modest_ui_dimming_rules_on_tools_smtp_servers):
+ * src/modest-ui-dimming-rules.h: Added a callback function to dim
+ the SMTP servers menu item.
+ * src/maemo/modest-main-window-ui-dimming.h: Used the function, so
+ that the SMTP Servers menu item is dimmed when there are no accounts,
+ as a future version of the UI spec will require. This fixes
+ projects.maemo.org bug NB#56305.
+
2007-06-11 Johannes Schmid <johannes.schmid@openismus.com>
* src/maemo/modest-maemo-utils.c:
const int response = gtk_dialog_run (GTK_DIALOG(note));
gtk_widget_destroy (note);
if (response == GTK_RESPONSE_OK) {
- modest_mail_operation_queue_cancel_all(queue);;
+ modest_mail_operation_queue_cancel_all(queue);
}
else
return;
if (!modest_text_utils_validate_recipient (address)) {
if (strstr (address, "@") == NULL) {
/* here goes searching in addressbook */
- gchar *contact_id = NULL;;
+ gchar *contact_id = NULL;
GSList *resolved_addresses = NULL;
result = resolve_address (address, &resolved_addresses, &contact_id);
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* Size limit */
- ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);;
- hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);;
+ ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);
+ hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);
g_signal_connect (ppriv->size_limit, "range_error", G_CALLBACK (on_range_error), self);
caption = hildon_caption_new (size_group,
_("mcen_fi_advsetup_sizelimit"),
{ "/MenuBar/ToolsMenu", NULL },
{ "/MenuBar/ToolsMenu/ToolsSettingsMenu", NULL },
{ "/MenuBar/ToolsMenu/ToolsAccountsMenu", NULL },
- { "/MenuBar/ToolsMenu/ToolsSMTPServersMenu", NULL },
+ { "/MenuBar/ToolsMenu/ToolsSMTPServersMenu", G_CALLBACK(modest_ui_dimming_rules_on_tools_smtp_servers) },
{ "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu", NULL },
{ "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu", NULL },
{ "/MenuBar/ToolsMenu/ToolsSendReceiveCancelSendingMenu", NULL },
{
ModestAccountMgr *self = MODEST_ACCOUNT_MGR (data);
ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
-
+
/* TODO: Also store the account names, and notify one list for each account,
* if anything uses the account names. */
if (priv->changed_conf_keys) {
- gchar *default_account =
+ gchar *default_account =
modest_account_mgr_get_default_account (self);
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0,
static void
on_key_change (ModestConf *conf, const gchar *key, ModestConfEvent event, gpointer user_data)
{
- /* printf("DEBUG: %s: key=%s\n", __FUNCTION__, key); */
-
ModestAccountMgr *self = MODEST_ACCOUNT_MGR (user_data);
ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
/* Store the key for later notification in our timeout callback.
* Notifying for every key change would cause unnecessary work: */
- priv->changed_conf_keys = g_slist_append (NULL,
+ priv->changed_conf_keys = g_slist_append (priv->changed_conf_keys,
(gpointer) g_strdup (key));
}
gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-// modest_platform_connect_and_wait ();;
+// modest_platform_connect_and_wait ();
}
}
gtk_widget_destroy (dialog);
}
+gboolean modest_ui_dimming_rules_on_tools_smtp_servers (ModestWindow *win, gpointer user_data)
+{
+ const gboolean dimmed =
+ !modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(),
+ TRUE);
+
+ return dimmed;
+}
+
+
/* *********************** static utility functions ******************** */
static gboolean
gboolean modest_ui_dimming_rules_on_delete_msgs (ModestWindow *win, gpointer user_data);
gboolean modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_tools_smtp_servers (ModestWindow *win, gpointer user_data);
+
G_END_DECLS
#endif
ModestFolderViewPrivate *priv;
GObject *rendobj;
gchar *fname = NULL;
- gint unread, all;
- TnyFolderType type;
+ gint unread = 0;
+ gint all = 0;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
g_return_if_fail (column);
gint number = 0;
if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) {
- TnyFolderType type;
- type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
- if (type != TNY_FOLDER_TYPE_UNKNOWN) {
+ TnyFolderType folder_type
+ = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
+ if (folder_type != TNY_FOLDER_TYPE_UNKNOWN) {
g_free (fname);
- fname = g_strdup(modest_local_folder_info_get_type_display_name (type));
+ fname = g_strdup(modest_local_folder_info_get_type_display_name (folder_type));
}
}
{
GObject *rendobj = NULL, *instance = NULL;
GdkPixbuf *pixbuf = NULL;
- TnyFolderType type;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
gchar *fname = NULL;
const gchar *account_id = NULL;
- gint unread;
+ gint unread = 0;
rendobj = G_OBJECT(renderer);
gtk_tree_model_get (tree_model, iter,
gpointer data)
{
gboolean retval = TRUE;
- gint type = 0;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
gtk_tree_model_get (model, iter,
GtkTreeIter iter;
ModestFolderView *tree_view;
ModestFolderViewPrivate *priv;
- gint type;
g_return_if_fail (sel);
g_return_if_fail (user_data);
tree_view = MODEST_FOLDER_VIEW (user_data);
gtk_tree_model_get (model, &iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
-1);
gpointer user_data)
{
gint cmp;
- gchar *name1, *name2;
- TnyFolderType type;
+ gchar *name1 = NULL;
+ gchar *name2 = NULL;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *folder1 = NULL;
GObject *folder2 = NULL;
{
do {
GtkTreeIter child;
- gint type;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+ gchar *name = NULL;
gtk_tree_model_get (model, iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
&type, -1);
+ /*
+ printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n",
+ __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX);
+ */
+
+ gboolean result = FALSE;
if (type == TNY_FOLDER_TYPE_INBOX) {
+ result = TRUE;
+ } else if (type == TNY_FOLDER_TYPE_NORMAL) {
+ /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL
+ * when getting folders from the cache, before connectin, so we do
+ * an extra check. We could fix this in tinymail, but it's easier
+ * to do here.
+ */
+ if (strcmp (name, "Inbox") == 0)
+ result = TRUE;
+ }
+
+ g_free (name);
+
+ if (result) {
*inbox_iter = *iter;
return TRUE;
}
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
gtk_tree_model_get_iter_first (model, &iter);
- if (find_inbox_iter (model, &iter, &inbox_iter))
+ if (find_inbox_iter (model, &iter, &inbox_iter)) {
gtk_tree_selection_select_iter (sel, &inbox_iter);
+ }
else {
gtk_tree_model_get_iter_first (model, &iter);
gtk_tree_selection_select_iter (sel, &iter);