#include <modest-hildon-includes.h>
#include <osso-helplib.h>
#include <dbus_api/modest-dbus-callbacks.h>
+#include <libosso-abook/osso-abook.h>
#include <maemo/modest-osso-autosave-callbacks.h>
#include <libosso.h>
#include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
#include <gtk/gtkmain.h>
#include <string.h>
+
#define HILDON_OSSO_URI_ACTION "uri-action"
#define URI_ACTION_COPY "copy:"
static osso_context_t *osso_context = NULL;
+
+static void folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window);
static void
on_modest_conf_update_interval_changed (ModestConf* self, const gchar *key,
}
gboolean
-modest_platform_init (void)
+modest_platform_init (int argc, char *argv[])
{
osso_hw_state_t hw_state = { 0 };
DBusConnection *con;
+
osso_context =
osso_initialize(PACKAGE,PACKAGE_VERSION,
FALSE, NULL);
}
if ((con = osso_get_dbus_connection (osso_context)) == NULL) {
- g_printerr ("Could not get dbus connection\n");
+ g_printerr ("modest: could not get dbus connection\n");
return FALSE;
}
-
+
+ /* Add a D-Bus handler to be used when the main osso-rpc
+ * D-Bus handler has not handled something.
+ * We use this for D-Bus methods that need to use more complex types
+ * than osso-rpc supports.
+ */
if (!dbus_connection_add_filter (con,
modest_dbus_req_filter,
NULL,
NULL)) {
- g_printerr ("Could not add dbus filter\n");
+ g_printerr ("modest: Could not add D-Bus filter\n");
return FALSE;
}
- /* Register our D-Bus callbacks, via the osso API: */
+ /* Register our simple D-Bus callbacks, via the osso API: */
osso_return_t result = osso_rpc_set_cb_f(osso_context,
MODEST_DBUS_SERVICE,
MODEST_DBUS_OBJECT,
MODEST_DBUS_IFACE,
modest_dbus_req_handler, NULL /* user_data */);
if (result != OSSO_OK) {
- g_print("Error setting D-BUS callback (%d)\n", result);
- return OSSO_ERROR;
+ g_printerr ("modest: Error setting D-BUS callback (%d)\n", result);
+ return FALSE;
}
/* Add handler for Exit D-BUS messages.
result = osso_application_set_autosave_cb (osso_context,
modest_on_osso_application_autosave, NULL /* user_data */);
if (result != OSSO_OK) {
- g_warning ("osso_application_set_autosave_cb() failed.");
+ g_printerr ("modest: osso_application_set_autosave_cb() failed.\n");
+ return FALSE;
}
/* Get the initial update interval from gconf: */
on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL,
MODEST_CONF_EVENT_KEY_CHANGED, NULL);
-
+
+ /* initialize the addressbook */
+ if (!osso_abook_init (&argc, &argv, osso_context)) {
+ g_printerr ("modest: failed to initialized addressbook\n");
+ return FALSE;
+ }
+
return TRUE;
}
mime_str = g_string_new (mime_type);
g_string_ascii_down (mime_str);
}
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
icons = osso_mime_get_icon_names (mime_str->str, NULL);
#else
icons = hildon_mime_get_icon_names (mime_str->str, NULL);
-#endif /*MODEST_HILDON_VERSION_0*/
+#endif /*MODEST_HAVE_OSSO_MIME*/
for (cursor = icons; cursor; ++cursor) {
if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), *cursor)) {
icon_name = g_strdup (*cursor);
-#ifdef MODEST_HILDON_VERSION_0
-
+#ifdef MODEST_HAVE_OSSO_MIME
gboolean
modest_platform_activate_uri (const gchar *uri)
{
return result;
}
-#else /* !MODEST_HILDON_VERSION_0*/
-
+#else /* !MODEST_HAVE_OSSO_MIME*/
gboolean
modest_platform_activate_uri (const gchar *uri)
}
-#endif /* MODEST_HILDON_VERSION_0*/
+#endif /* MODEST_HAVE_OSSO_MIME*/
gboolean
modest_platform_activate_file (const gchar *path, const gchar *mime_type)
uri_path = g_strconcat ("file://", path, NULL);
con = osso_get_dbus_connection (osso_context);
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
result = osso_mime_open_file_with_mime_type (con, uri_path, mime_str->str);
g_string_free (mime_str, TRUE);
if (result != 1)
hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer"));
return result != 1;
-#endif
+#endif /*MODEST_HAVE_OSSO_MIME*/
}
ModestPlatformPopupInfo *popup_info = (ModestPlatformPopupInfo *) userdata;
g_free (popup_info->uri);
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
osso_uri_free_actions (popup_info->actions);
#else
hildon_uri_free_actions (popup_info->actions);
-#endif
+#endif /*MODEST_HAVE_OSSO_MIME*/
return FALSE;
}
/* now, the real uri-actions... */
for (node = popup_info->actions; node != NULL; node = g_slist_next (node)) {
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
OssoURIAction *action = (OssoURIAction *) node->data;
if (strcmp (action_name, osso_uri_action_get_name (action))==0) {
osso_uri_open (popup_info->uri, action, NULL);
hildon_uri_open (popup_info->uri, action, NULL);
break;
}
-#endif
+#endif /*MODEST_HAVE_OSSO_MIME*/
}
}
if (uri == NULL)
return FALSE;
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
scheme = osso_uri_get_scheme_from_uri (uri, NULL);
actions_list = osso_uri_get_actions (scheme, NULL);
#else
scheme = hildon_uri_get_scheme_from_uri (uri, NULL);
actions_list = hildon_uri_get_actions (scheme, NULL);
-#endif
+#endif /* MODEST_HAVE_OSSO_MIME */
if (actions_list != NULL) {
GSList *node;
GtkWidget *menu = gtk_menu_new ();
GtkWidget *menu_item;
const gchar *action_name;
const gchar *translation_domain;
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_MIME
OssoURIAction *action = (OssoURIAction *) node->data;
action_name = osso_uri_action_get_name (action);
translation_domain = osso_uri_action_get_translation_domain (action);
} else {
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
}
-#endif
+#endif /*MODEST_HAVE_OSSO_MIME*/
gtk_widget_show (menu_item);
}
/* Show WID-INF036 */
if (chars_length == 20) {
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
- _("mcen_ib_maxchar_reached"));
+ dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached"));
} else {
if (chars_length == 0) {
/* A blank space is not valid as first character */
gchar *chars;
chars = gtk_editable_get_chars (editable, 0, -1);
+ g_return_if_fail (chars != NULL);
- /* Dimm OK button */
- if (strlen (chars) == 0) {
+ /* Dimm OK button. Do not allow also the "/" */
+ if (strlen (chars) == 0 || strchr (chars, '/')) {
GtkWidget *ok_button;
GList *buttons;
gtk_widget_set_sensitive (ok_button, FALSE);
g_list_free (buttons);
+ } else if (strlen (chars) == 21) {
+ hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL,
+ dgettext("hildon-common-strings", "ckdg_ib_maximum_characters_reached"));
}
+
+ /* Free */
g_free (chars);
}
GtkSortType current_sort_type;
gint attachments_sort_id;
gint priority_sort_id;
+ GtkTreeSortable *sortable;
/* Get header window */
if (MODEST_IS_MAIN_WINDOW (parent_window)) {
if (!header_view) return;
/* Add sorting keys */
- cols = modest_header_view_get_columns (header_view);
+ cols = modest_header_view_get_columns (header_view);
if (cols == NULL) return;
int sort_model_ids[6];
int sort_ids[6];
sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
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)))));
/* Launch dialogs */
- if (!gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))),
+ if (!gtk_tree_sortable_get_sort_column_id (sortable,
¤t_sort_colid, ¤t_sort_type)) {
hildon_sort_dialog_set_sort_key (dialog, default_key);
hildon_sort_dialog_set_sort_order (dialog, GTK_SORT_DESCENDING);
hildon_sort_dialog_set_sort_key (dialog, current_sort_keyid);
}
}
+
result = gtk_dialog_run (GTK_DIALOG (dialog));
if (result == GTK_RESPONSE_OK) {
sort_key = hildon_sort_dialog_get_sort_key (dialog);
}
modest_header_view_sort_by_column_id (header_view, sort_model_ids[sort_key], sort_type);
- gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))));
+ gtk_tree_sortable_sort_column_changed (sortable);
}
+
+ modest_widget_memory_save (modest_runtime_get_conf (),
+ G_OBJECT (header_view), MODEST_CONF_HEADER_VIEW_KEY);
/* free */
g_list_free(cols);
}
-
-
-gint
-modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
- TnyFolderStore *parent_folder,
- gchar *suggested_name,
- gchar **folder_name)
+static gint
+modest_platform_run_folder_name_dialog (GtkWindow *parent_window,
+ const gchar *dialog_title,
+ const gchar *label_text,
+ const gchar *suggested_name,
+ gchar **folder_name)
{
+ GtkWidget *accept_btn = NULL;
GtkWidget *dialog, *entry, *label, *hbox;
+ GList *buttons = NULL;
gint result;
/* Ask the user for the folder name */
- dialog = gtk_dialog_new_with_buttons (_("mcen_ti_new_folder"),
+ dialog = gtk_dialog_new_with_buttons (dialog_title,
parent_window,
GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK,
GTK_RESPONSE_REJECT,
NULL);
+ /* Add accept button (with unsensitive handler) */
+ buttons = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
+ accept_btn = GTK_WIDGET (buttons->next->data);
+ g_signal_connect (G_OBJECT (accept_btn), "insensitive-press", G_CALLBACK (folder_name_insensitive_press), parent_window);
+
/* Create label and entry */
- label = gtk_label_new (_("mcen_fi_new_folder_name"));
+ label = gtk_label_new (label_text);
/* TODO: check that the suggested name does not exist */
/* We set 21 as maximum because we want to show WID-INF036
when the user inputs more that 20 */
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
result = gtk_dialog_run (GTK_DIALOG(dialog));
if (result == GTK_RESPONSE_ACCEPT)
*folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
return result;
}
+static void
+folder_name_insensitive_press (GtkWidget *widget, ModestWindow *window)
+{
+ hildon_banner_show_information (NULL, NULL, _("(empty)"));
+}
+
+gint
+modest_platform_run_new_folder_dialog (GtkWindow *parent_window,
+ TnyFolderStore *parent_folder,
+ gchar *suggested_name,
+ gchar **folder_name)
+{
+ return modest_platform_run_folder_name_dialog (parent_window,
+ _("mcen_ti_new_folder"),
+ _("mcen_fi_new_folder_name"),
+ suggested_name,
+ folder_name);
+}
+
+gint
+modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
+ TnyFolderStore *parent_folder,
+ const gchar *suggested_name,
+ gchar **folder_name)
+{
+ return modest_platform_run_folder_name_dialog (parent_window,
+ _("New folder name"),
+ _("Enter new folder name:"),
+ suggested_name,
+ folder_name);
+}
+
gint
modest_platform_run_confirmation_dialog (GtkWindow *parent_window,
const gchar *message)
gint response;
dialog = hildon_note_new_confirmation (parent_window, message);
+ gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
response = gtk_dialog_run (GTK_DIALOG (dialog));
st_time->tm_min += minutes;
/* Set the time in alarm_event_t structure: */
- alarm_event_t event;
- memset (&event, 0, sizeof (alarm_event_t));
- event.alarm_time = mktime (st_time);
+ alarm_event_t *event = g_new0(alarm_event_t, 1);
+ event->alarm_time = mktime (st_time);
/* Specify what should happen when the alarm happens:
* It should call this D-Bus method: */
/* Note: I am surpised that alarmd can't just use the modest.service file
* for this. murrayc. */
- event.dbus_path = g_strdup(PREFIX "/bin/modest");
+ event->dbus_path = g_strdup(PREFIX "/bin/modest");
- event.dbus_interface = g_strdup (MODEST_DBUS_IFACE);
- event.dbus_service = g_strdup (MODEST_DBUS_SERVICE);
- event.dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE);
+ event->dbus_interface = g_strdup (MODEST_DBUS_IFACE);
+ event->dbus_service = g_strdup (MODEST_DBUS_SERVICE);
+ event->dbus_name = g_strdup (MODEST_DBUS_METHOD_SEND_RECEIVE);
/* Otherwise, a dialog will be shown if exect_name or dbus_path is NULL,
even though we have specified no dialog text: */
- event.flags = ALARM_EVENT_NO_DIALOG;
+ event->flags = ALARM_EVENT_NO_DIALOG;
- alarm_cookie = alarm_event_add (&event);
+ alarm_cookie = alarm_event_add (event);
+
+ /* now, free it */
+ alarm_event_free (event);
/* Store the alarm ID in GConf, so we can remove it later:
* This is apparently valid between application instances. */
void
modest_platform_on_new_msg (void)
{
- return; /* TODO: Reenable this later. I disabled it to avoid having one notification per email. */
-#ifndef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_HILDON_NOTIFY
HildonNotification *not;
/* Create a new notification. FIXME put the right values, need
"system.note.dialog");
/* Play sound SR-SND-18. TODO: play the right file */
-/* hildon_notification_set_sound (not, "/usr/share/sounds/ui-new_email.wav"); */
+ /* TODO: Where is this declared? hildon_notification_set_sound (not, "/usr/share/sounds/ui-new_email.wav"); */
/* Set the led pattern */
notify_notification_set_hint_int32 (NOTIFY_NOTIFICATION (not), "led-pattern", 3);
g_error ("Failed to send notification");
g_object_unref (not);
-#endif /*MODEST_HILDON_VERSION_0*/
+#endif /*MODEST_HAVE_HILDON_NOTIFY*/
}
g_return_if_fail (osso_context);
/* Show help */
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_OSSO_HELP
result = ossohelp_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
#else
result = hildon_help_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
return widget;
}
+
+void
+modest_platform_information_banner (GtkWidget *widget,
+ const gchar *icon_name,
+ const gchar *text)
+{
+ hildon_banner_show_information (widget, icon_name, text);
+}
projects / modest / blobdiff