#endif /*MODEST_HAVE_LIBALARM*/
-
#define HILDON_OSSO_URI_ACTION "uri-action"
#define URI_ACTION_COPY "copy:"
-static osso_context_t *osso_context = NULL; /* urgh global */
-
static void
on_modest_conf_update_interval_changed (ModestConf* self,
const gchar *key,
}
-
+/* the gpointer here is the osso_context. */
gboolean
modest_platform_init (int argc, char *argv[])
{
+ osso_context_t *osso_context;
+
osso_hw_state_t hw_state = { 0 };
DBusConnection *con;
GSList *acc_names;
g_printerr ("modest: missing required files\n");
return FALSE;
}
-
- osso_context =
- osso_initialize(PACKAGE,PACKAGE_VERSION,
- FALSE, NULL);
+ osso_context = osso_initialize(PACKAGE,PACKAGE_VERSION,
+ FALSE, NULL);
if (!osso_context) {
g_printerr ("modest: failed to acquire osso context\n");
return FALSE;
}
+ modest_maemo_utils_set_osso_context (osso_context);
if ((con = osso_get_dbus_connection (osso_context)) == NULL) {
g_printerr ("modest: could not get dbus connection\n");
return FALSE;
-
}
/* Add a D-Bus handler to be used when the main osso-rpc
modest_dbus_req_handler, NULL /* user_data */);
if (result != OSSO_OK) {
g_printerr ("modest: Error setting D-BUS callback (%d)\n", result);
- return FALSE;
+ return FALSE;
}
- /* Add handler for Exit D-BUS messages.
- * Not used because osso_application_set_exit_cb() is deprecated and obsolete:
- result = osso_application_set_exit_cb(osso_context,
- modest_dbus_exit_event_handler,
- (gpointer) NULL);
- if (result != OSSO_OK) {
- g_print("Error setting exit callback (%d)\n", result);
- return OSSO_ERROR;
- }
- */
-
/* Register hardware event dbus callback: */
hw_state.shutdown_ind = TRUE;
osso_hw_set_event_cb(osso_context, NULL,/*&hw_state*/ modest_osso_cb_hw_state_handler, NULL);
}
#endif /*MODEST_HAVE_ABOOK*/
+ return TRUE;
+}
+
+gboolean
+modest_platform_uninit (void)
+{
+ osso_context_t *osso_context =
+ modest_maemo_utils_get_osso_context ();
+ if (osso_context)
+ osso_deinitialize (osso_context);
return TRUE;
}
+
+
+
TnyDevice*
modest_platform_get_new_device (void)
{
}
+static gboolean
+checked_hildon_uri_open (const gchar *uri, HildonURIAction *action)
+{
+ GError *err = NULL;
+ gboolean result;
+
+ g_return_val_if_fail (uri, FALSE);
+
+ result = hildon_uri_open (uri, action, &err);
+ if (!result) {
+ g_printerr ("modest: hildon_uri_open ('%s', %p) failed: %s",
+ uri, action, err && err->message ? err->message : "unknown error");
+ if (err)
+ g_error_free (err);
+ }
+ return result;
+}
+
+
+
gboolean
modest_platform_activate_uri (const gchar *uri)
{
action = (HildonURIAction*) iter->data;
if (action && strcmp (hildon_uri_action_get_service (action),
"com.nokia.modest") == 0) {
- GError *err = NULL;
- result = hildon_uri_open (uri, action, &err);
- if (!result && err) {
- g_printerr ("modest: modest_platform_activate_uri : %s",
- err->message ? err->message : "unknown error");
- g_error_free (err);
- }
+ result = checked_hildon_uri_open (uri, action);
break;
}
}
/* if we could not open it with email, try something else */
if (!result)
- result = hildon_uri_open (uri, NULL, NULL);
-
- if (!result)
- hildon_banner_show_information (NULL, NULL, _("mcen_ib_unsupported_link"));
+ result = checked_hildon_uri_open (uri, NULL);
+
+ if (!result) {
+ ModestWindow *parent =
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+ hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
+ _("mcen_ib_unsupported_link"));
+ }
return result;
}
gchar *uri_path = NULL;
uri_path = g_strconcat ("file://", path, NULL);
- con = osso_get_dbus_connection (osso_context);
+ con = osso_get_dbus_connection (modest_maemo_utils_get_osso_context());
if (mime_type)
result = hildon_mime_open_file_with_mime_type (con, uri_path, mime_type);
for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
HildonURIAction *action = (HildonURIAction *) node->data;
if (strcmp (action_name, hildon_uri_action_get_name (action))==0) {
- hildon_uri_open (popup_info->uri, action, NULL);
+ if (!checked_hildon_uri_open (popup_info->uri, action)) {
+ ModestWindow *parent =
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+ hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
+ _("mcen_ib_unsupported_link"));
+ }
break;
}
}
header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_window),
MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
}
- if (!header_view) return;
-
+ if (!header_view)
+ return;
+
/* Add sorting keys */
cols = modest_header_view_get_columns (header_view);
- if (cols == NULL) return;
- int sort_model_ids[6];
- int sort_ids[6];
-
+ if (cols == NULL)
+ return;
+#define SORT_ID_NUM 6
+ int sort_model_ids[SORT_ID_NUM];
+ int sort_ids[SORT_ID_NUM];
outgoing = (GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cols->data), MODEST_HEADER_VIEW_COLUMN))==
MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT);
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
priority_sort_id = sort_key;
-
- sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));
+
+ sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
+ (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));
/* Launch dialogs */
if (!gtk_tree_sortable_get_sort_column_id (sortable,
¤t_sort_colid, ¤t_sort_type)) {
/* Look for another folder with the same name */
if (modest_tny_folder_has_subfolder_with_name (parent,
- gtk_entry_get_text (GTK_ENTRY (entry)))) {
+ gtk_entry_get_text (GTK_ENTRY (entry)),
+ TRUE)) {
+
/* Show an error */
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)),
NULL, _CS("ckdg_ib_folder_already_exists"));
else
real_suggested_name = g_strdup_printf (_("mcen_ia_default_folder_name_s"),
num_str);
-
exists = modest_tny_folder_has_subfolder_with_name (parent_folder,
- real_suggested_name);
+ real_suggested_name,
+ TRUE);
if (!exists)
break;
dialog = hildon_sort_dialog_new (parent_window);
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
GTK_WINDOW (dialog));
-
+
+ hildon_help_dialog_help_enable (GTK_DIALOG(dialog),
+ "applications_email_sort",
+ modest_maemo_utils_get_osso_context());
+
/* Fill sort keys */
switch (type) {
case MODEST_SORT_HEADERS:
/* Delete any existing alarm,
* because we will replace it: */
if (alarm_cookie) {
- /* TODO: What does the alarm_event_del() return value mean? */
- alarm_event_del(alarm_cookie);
+ if (alarm_event_del(alarm_cookie) != 1)
+ g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie);
alarm_cookie = 0;
modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL);
}
/* 0 means no updates: */
if (minutes == 0)
return TRUE;
-
+
/* Register alarm: */
const gchar *help_id)
{
osso_return_t result;
-
g_return_if_fail (help_id);
- g_return_if_fail (osso_context);
-
- result = hildon_help_show (osso_context, help_id, HILDON_HELP_SHOW_DIALOG);
+ result = hildon_help_show (modest_maemo_utils_get_osso_context(),
+ help_id, HILDON_HELP_SHOW_DIALOG);
+
if (result != OSSO_OK) {
gchar *error_msg;
error_msg = g_strdup_printf ("FIXME The help topic %s could not be found", help_id);
}
}
-void
-modest_platform_set_dialog_help (GtkDialog *parent_window,
- const gchar *help_id)
-{
- gboolean result;
- g_return_if_fail (help_id);
- g_return_if_fail (osso_context);
- g_return_if_fail (GTK_IS_DIALOG (parent_window));
-
- result = hildon_help_dialog_help_enable (parent_window, help_id, osso_context);
-
- if (!result)
- g_warning ("Help topic %s not found", help_id);
-
-}
-
void
modest_platform_show_search_messages (GtkWindow *parent_window)
{
osso_return_t result = OSSO_ERROR;
- result = osso_rpc_run_with_defaults (osso_context, "osso_global_search", "search_email", NULL, DBUS_TYPE_INVALID);
+ result = osso_rpc_run_with_defaults (modest_maemo_utils_get_osso_context(),
+ "osso_global_search",
+ "search_email", NULL, DBUS_TYPE_INVALID);
if (result != OSSO_OK) {
g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__);
{
osso_return_t result = OSSO_ERROR;
- result = osso_rpc_run_with_defaults (osso_context, "osso_addressbook", "top_application", NULL, DBUS_TYPE_INVALID);
+ result = osso_rpc_run_with_defaults (modest_maemo_utils_get_osso_context(),
+ "osso_addressbook",
+ "top_application", NULL, DBUS_TYPE_INVALID);
if (result != OSSO_OK) {
g_warning ("%s: osso_rpc_run_with_defaults() failed.\n", __FUNCTION__);
#define NUMBER_OF_TRIES 10 /* Try approx every second, ten times. */
static gboolean
-on_timeout_check_account_is_online(gpointer user_data)
+on_timeout_check_account_is_online(CheckAccountIdleData* data)
{
- printf ("DEBUG: %s:\n", __FUNCTION__);
- CheckAccountIdleData *data = (CheckAccountIdleData*)user_data;
-
- if (!data) {
- g_warning ("%s: data is NULL.\n", __FUNCTION__);
- }
-
- if (!(data->account)) {
- g_warning ("%s: data->account is NULL.\n", __FUNCTION__);
- }
+ gboolean stop_trying = FALSE;
+ g_return_val_if_fail (data && data->account, FALSE);
- if (data && data->account) {
- printf ("DEBUG: %s: tny_account_get_connection_status()==%d\n", __FUNCTION__, tny_account_get_connection_status (data->account));
- }
+ printf ("DEBUG: %s: tny_account_get_connection_status()==%d\n", __FUNCTION__,
+ tny_account_get_connection_status (data->account));
- gboolean stop_trying = FALSE;
if (data && data->account &&
/* We want to wait until TNY_CONNECTION_STATUS_INIT has changed to something else,
* after which the account is likely to be usable, or never likely to be usable soon: */
data->is_online = TRUE;
stop_trying = TRUE;
- }
- else {
+ } else {
/* Give up if we have tried too many times: */
- if (data->count_tries >= NUMBER_OF_TRIES)
- {
+ if (data->count_tries >= NUMBER_OF_TRIES) {
stop_trying = TRUE;
- }
- else {
+ } else {
/* Wait for another timeout: */
++(data->count_tries);
}
GMainContext *context = NULL; /* g_main_context_new (); */
data->loop = g_main_loop_new (context, FALSE /* not running */);
- g_timeout_add (1000, on_timeout_check_account_is_online, data);
+ g_timeout_add (1000, (GSourceFunc)(on_timeout_check_account_is_online), data);
/* This main loop will run until the idle handler has stopped it: */
g_main_loop_run (data->loop);
projects / modest / blobdiff