+2007-04-04 Murray Cumming <murrayc@murrayc.com>
+
+ * Makefile.am:
+ * configure.ac:
+ * src/modest-runtime.c: (init_i18n): Restored the translation
+ infrastructure, so that GETTEXT_PACKAGE and MODEST_LOCALE_DIR
+ are defined in config.h, and the translations are installed.
+
+ * src/maemo/easysetup/: Include config.h so that GETTEXT_PACKAGE
+ is defined for translation.
+
2007-04-03 Murray Cumming <murrayc@murrayc.com>
* src/maemo/easysetup/modest-easysetup-country-combo-box.c:
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.b
-SUBDIRS= src man
-#po
+SUBDIRS= src man po
if BUILD_TESTS
SUBDIRS += tests
AM_INIT_AUTOMAKE([dist-bzip2])
# Check for gettext support
-QGETTEXT_PACKAGE=modest
+GETTEXT_PACKAGE=modest
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"])
ALL_LINGUAS="en_GB gl nl"
-#AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR])
+
+MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale'
+AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR])
AM_GLIB_GNU_GETTEXT
-modestlocaledir='$prefix/${DATADIRNAME}/locale'
-AC_SUBST(modestlocaledir)
+
if test x$prefix = xNONE; then
prefix=/usr/local
{
/* Setup gettext, to use our .po files: */
/* GETTEXT_PACKAGE is defined in config.h */
- /* OSSO_MODEST_EASYSETUP_LOCALEDIR is defined in the Makefile.am */
+ /* OSSO_MODEST_EASYSETUP_LOCALEDIR is defined in config.h */
bindtextdomain (GETTEXT_PACKAGE, OSSO_MODEST_EASYSETUP_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#include <libintl.h> /* For dgettext(). */
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
G_DEFINE_TYPE (EasysetupCountryComboBox, easysetup_country_combo_box, GTK_TYPE_COMBO_BOX);
#define COUNTRY_COMBO_BOX_GET_PRIVATE(o) \
*
*/
-#define _GNU_SOURCE /* So we can use the getline() function, which is a convenient GNU extension. */
-#include <stdio.h>
-
#include "modest-easysetup-provider-combo-box.h"
#include <gtk/gtkliststore.h>
#include <gtk/gtkcelllayout.h>
#include <stdlib.h>
#include <string.h> /* For memcpy() */
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
G_DEFINE_TYPE (EasysetupProviderComboBox, easysetup_provider_combo_box, GTK_TYPE_COMBO_BOX);
#define PROVIDER_COMBO_BOX_GET_PRIVATE(o) \
*
*/
-#define _GNU_SOURCE /* So we can use the getline() function, which is a convenient GNU extension. */
-#include <stdio.h>
-
#include "modest-easysetup-secureauth-combo-box.h"
#include <gtk/gtkliststore.h>
#include <gtk/gtkcelllayout.h>
#include <stdlib.h>
#include <string.h> /* For memcpy() */
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
G_DEFINE_TYPE (EasysetupSecureauthComboBox, easysetup_secureauth_combo_box, GTK_TYPE_COMBO_BOX);
#define SECUREAUTH_COMBO_BOX_GET_PRIVATE(o) \
*
*/
-#define _GNU_SOURCE /* So we can use the getline() function, which is a convenient GNU extension. */
-#include <stdio.h>
-
#include "modest-easysetup-serversecurity-combo-box.h"
#include <gtk/gtkliststore.h>
#include <gtk/gtkcelllayout.h>
#include <stdlib.h>
#include <string.h> /* For memcpy() */
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
G_DEFINE_TYPE (EasysetupServersecurityComboBox, easysetup_serversecurity_combo_box, GTK_TYPE_COMBO_BOX);
#define SERVERSECURITY_COMBO_BOX_GET_PRIVATE(o) \
*
*/
-#define _GNU_SOURCE /* So we can use the getline() function, which is a convenient GNU extension. */
-#include <stdio.h>
-
#include "modest-easysetup-servertype-combo-box.h"
#include <gtk/gtkliststore.h>
#include <gtk/gtkcelllayout.h>
#include <stdlib.h>
#include <string.h> /* For memcpy() */
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
G_DEFINE_TYPE (EasysetupServertypeComboBox, easysetup_servertype_combo_box, GTK_TYPE_COMBO_BOX);
#define SERVERTYPE_COMBO_BOX_GET_PRIVATE(o) \
#include "modest-validating-entry.h"
#include "modest-text-utils.h"
#include "modest-account-mgr.h"
+#include "modest-runtime.h" /* For modest_runtime_get_account_mgr(). */
#include <gconf/gconf-client.h>
#include <string.h> /* For strlen(). */
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#define EXAMPLE_EMAIL_ADDRESS "first.last@provider.com"
G_DEFINE_TYPE (ModestEasysetupWizardDialog, modest_easysetup_wizard_dialog, MODEST_TYPE_WIZARD_DIALOG);
g_assert(priv->presets);
- /* Create the account manager object,
+ /* Get the account manager object,
* so we can check for existing accounts,
* and create new accounts: */
- ModestConf *conf = modest_conf_new (); /* Just a thin wrapper around GConfClient. */
- self->account_manager = modest_account_mgr_new (conf);
- g_object_unref (conf);
+ self->account_manager = modest_runtime_get_account_mgr ();
+ g_assert (self->account_manager);
/* Create the common pages,
*/
#include <string.h> /* for strcmp */
#include "modest-presets.h"
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#define MODEST_PRESETS_KEY_NAME "Name"
#define MODEST_PRESETS_KEY_DOMAIN "Domain"
#define MODEST_PRESETS_KEY_MCC "MCC"
#include <gtk/gtksignal.h> /* For the gtk_signal_stop_emit_by_name() convenience function. */
#include <string.h> /* For strlen(). */
+/* Include config.h so that _() works: */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
G_DEFINE_TYPE (EasysetupValidatingEntry, easysetup_validating_entry, GTK_TYPE_ENTRY);
#define VALIDATING_ENTRY_GET_PRIVATE(o) \
static void
init_i18n (void)
{
- bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALEDIR);
+ /* Setup gettext, to use our .po files: */
+ /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
+ bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
}
void
modest_ui_actions_on_new_account (GtkAction *action, ModestWindow *win)
-{
+{
ModestEasysetupWizardDialog *wizard = modest_easysetup_wizard_dialog_new ();
- gtk_window_set_transient_for (GTK_WINDOW (wizard), win);
+ gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
gtk_dialog_run (GTK_DIALOG (wizard));
- gtk_widget_destroy (wizard);
+ gtk_widget_destroy (GTK_WIDGET (wizard));
}
void