2007-06-20 Murray Cumming <murrayc@murrayc-desktop>
+ * src/maemo/easysetup/modest-easysetup-country-combo-box.c:
+ (load_from_file): Sort the list. The unsorted list would be more noticeable
+ in non-English locales.
+
+ * src/maemo/modest-msg-edit-window.c:
+ (modest_msg_edit_window_attach_file): Initialize a variable to avoid a
+ warning and fix the build.
+
+ * src/maemo/modest-progress-bar-widget.c:
+ (modest_progress_bar_widget_set_progress): Avoid a division by zero, to
+ avoid a g_warning, and probably to avoid a crash.
+
+2007-06-20 Murray Cumming <murrayc@murrayc-desktop>
+
* src/modest-search.c: (modest_search_folder): Check for a GError
when calling tny_folder_get_headers(), to show that this is not the cause
of later failure.
#ifndef MODEST_HILDON_VERSION_0
const gchar* filepath = PROVIDER_DATA_DIR "/mcc_mapping";
#else
- /* this is the official version, in the 'operator-wizard-settings' package */
+ /* This is the official version, in the 'operator-wizard-settings' package */
const gchar* filepath = "/usr/share/operator-wizard/mcc_mapping";
#endif /*MODEST_HILDON_VERSION_0*/
/* printf ("DEBUG: %s: filepath=%s\n", __FUNCTION__, filepath); */
free (line);
fclose (file);
+
+ /* Sort the items: */
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (liststore),
+ MODEL_COL_NAME, GTK_SORT_ASCENDING);
}
static void
ModestMsgEditWindowPrivate *priv;
GtkWidget *dialog = NULL;
gint response = 0;
- GSList *uris;
+ GSList *uris = NULL;
GSList *uri_node;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self);
/* Set progress */
- if (total != 100) /* FIXME: tinymail send 1/100 when it doesn't know better.. */
+ if (total != 100) /* FIXME: tinymail send 1/100 when it doesn't know better.. */ {
+ gdouble percent = 0;
+ if (total != 0) /* Avoid division by zero. */
+ percent = (gdouble)done/(gdouble)total;
+
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar),
- (gdouble)done/(gdouble)total);
- else
+ percent);
+ }else
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar));
/* Set text */
if (!ret) {
- printf("libmodest_dbus_client_open_message() failed.\n");
+ printf("libmodest_dbus_client_compose_mai() failed.\n");
return OSSO_ERROR;
} else {
- printf("libmodest_dbus_client_open_message() succeeded!\n");
+ printf("libmodest_dbus_client_compose_mail() succeeded\n");
}
/* Exit */