AC_CONFIG_SRCDIR(src/modest-main.c)
AM_INIT_AUTOMAKE([dist-bzip2])
-# Check for gettext support
-GETTEXT_PACKAGE=modest
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
ALL_LINGUAS="en_GB"
if test "$hildon1" == "yes"; then # the 'new' hildon
PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2 libalarm hildon-notify libnotify)
+ GETTEXT_PACKAGE=osso-email
+
else # the old hildon
- PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0)
- AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])
+ PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0)
+ AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])
+
+ GETTEXT_PACKAGE=modest
fi
AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir`
plugindesktopentrydir=`$PKG_CONFIG hildon-control-panel --variable=plugindesktopentrydir`
+ # Check for gettext support
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
+
dbus_api="dbus_api"
AC_SUBST(dbus_api)
static GtkWidget * create_empty_view (void);
-static gchar *
-translate_func (const gchar *msgid,
- const gchar *domain_name);
-
/* list my signals */
enum {
action_group = gtk_action_group_new ("ModestMainWindowActions");
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
- gtk_action_group_set_translate_func (action_group, (GtkTranslateFunc) translate_func, GETTEXT_PACKAGE, g_free);
menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
refresh_account ((const gchar*) user_data);
}
-static gchar *
-translate_func (const gchar *msgid,
- const gchar *domain_name)
-{
- return _(msgid);
-}
static void modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
ModestMsgEditWindow *window);
-
/* list my signals */
enum {
/* MY_SIGNAL_1, */
gtk_toggle_action_set_active (toggle, FALSE);
}
+
static void update_window_title (ModestMsgViewWindow *window);
-static gchar *
-translate_func (const gchar *msgid,
- const gchar *domain_name);
/* list my signals */
enum {
action_group = gtk_action_group_new ("ModestMsgViewWindowActions");
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
- gtk_action_group_set_translate_func (action_group, (GtkTranslateFunc) translate_func, GETTEXT_PACKAGE, g_free);
menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules");
toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules");
gtk_window_set_title (GTK_WINDOW (window), subject);
}
-static gchar *
-translate_func (const gchar *msgid,
- const gchar *domain_name)
-{
- return _(msgid);
-}
const gchar* gettext_package;
/* Setup gettext, to use our .po files: */
/* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
-#ifdef MODEST_HILDON_VERSION_0
- gettext_package = GETTEXT_PACKAGE;
- bindtextdomain (gettext_package, MODEST_LOCALE_DIR);
-#else
- gettext_package = "osso-email"; /* HACK to use the localizations */
- bindtextdomain (gettext_package, "/usr/share/locale");
-#endif /*MODEST_HILDON_VERSION_0*/
+/* #ifdef MODEST_HILDON_VERSION_0 */
+/* gettext_package = GETTEXT_PACKAGE; */
+/* bindtextdomain (gettext_package, MODEST_LOCALE_DIR); */
+/* #else */
+/* gettext_package = "osso-email"; /\* HACK to use the localizations *\/ */
+/* bindtextdomain (gettext_package, "/usr/share/locale"); */
+/* #endif /\*MODEST_HILDON_VERSION_0*\/ */
+ gettext_package = GETTEXT_PACKAGE;
+
bind_textdomain_codeset (gettext_package, "UTF-8");
textdomain (gettext_package);
/* tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); */
}
-#if 0
gboolean
modest_tny_send_queue_msg_is_being_sent (ModestTnySendQueue* self,
const gchar *msg_id)
{
- ModestTnySendQueuePrivate *priv;
+ ModestTnySendQueueStatus status;
g_return_val_if_fail (msg_id != NULL, FALSE);
- priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
- if (modest_tny_send_queue_sending_in_progress(self))
- return g_ascii_strcasecmp(priv->current_msg_id, msg_id);
- else
- return FALSE;
+ status = modest_tny_send_queue_get_msg_status (self, msg_id);
+ return status == MODEST_TNY_SEND_QUEUE_SENDING;
}
-#endif
gboolean
modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self)
*/
gboolean modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self);
-#if 0
/**
* modest_tny_send_queue_msg_is_being_sent:
* @self: a valid #ModestTnySendQueue instance
* Checks if message identifies with @msg_id is currently being sent.
*/
gboolean modest_tny_send_queue_msg_is_being_sent (ModestTnySendQueue* self, const gchar *msg_id);
-#endif
/**
* modest_tny_send_queue_get_msg_status:
if (MODEST_IS_MAIN_WINDOW (win)) {
header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
MODEST_WIDGET_TYPE_HEADER_VIEW);
- if (!GTK_WIDGET_HAS_FOCUS (header_view))
+ if (!gtk_widget_is_focus (header_view))
return;
}
if (!dimmed) {
dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win));
if (dimmed)
- modest_dimming_rule_set_notification (rule, _("mcen_ib_nothing_to_del"));
+ modest_dimming_rule_set_notification (rule, _("ckct_ib_nothing_to_delete"));
}
if (!dimmed) {
dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
/* Check dimmed rule (TODO: check focus on widgets */
if (!result) {
- result = ((selected_headers == NULL) ||
- (GTK_WIDGET_HAS_FOCUS (folder_view)));
+ result = (selected_headers == NULL);
+/* result = ((selected_headers == NULL) || */
+/* (GTK_WIDGET_HAS_FOCUS (folder_view))); */
if (result)
modest_dimming_rule_set_notification (rule, _("mcen_ib_no_message_selected"));
}
}
/* Check if msg id is being processed inside send queue */
- result = (modest_tny_send_queue_get_msg_status (send_queue, tny_header_get_message_id(header)) == MODEST_TNY_SEND_QUEUE_SENDING);
+ result = modest_tny_send_queue_msg_is_being_sent (send_queue, id);
/* Free */
g_free(id);
return;
gchar* last_updated_string = get_last_updated_string(account_mgr, account_data);
gtk_list_store_set(model, &iter,
- MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
- -1);
+ MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
+ -1);
g_free (last_updated_string);
modest_account_mgr_free_account_data (account_mgr, account_data);
return;