#include <config.h>
#endif /*HAVE_CONFIG_H*/
+#ifdef MODEST_HAVE_CONIC
+#include <coniciap.h>
+#endif /*MODEST_HAVE_CONIC*/
+
#include <modest-hildon-includes.h>
#include <modest-maemo-utils.h>
#include <tny-maemo-conic-device.h>
-
#define MSG_SIZE_MAX_VAL 5000
#define MSG_SIZE_DEF_VAL 1000
#define MSG_SIZE_MIN_VAL 1
{
/* grab the focus to the default element in the current page */
GtkWidget *selected_page = NULL, *focus_item = NULL;
- ModestGlobalSettingsDialogPrivate *ppriv;
- ModestMaemoGlobalSettingsDialogPrivate *priv;
SwitchPageHelper *helper;
- priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
- ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (user_data);
-
selected_page = gtk_notebook_get_nth_page (notebook, page_num);
focus_item = GTK_WIDGET(g_object_get_data (G_OBJECT(selected_page), DEFAULT_FOCUS_WIDGET));
if (!focus_item) {
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
- gtk_window_set_default_size (GTK_WINDOW (self), -1, 300);
+ gtk_window_set_default_size (GTK_WINDOW (self), 700, 300);
g_signal_connect (G_OBJECT (self), "key-press-event",
G_CALLBACK (on_inner_tabs_key_pressed), self);
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
if (priv->switch_handler && ppriv->notebook) {
- /* TODO: This causes a g_warning:
- modest[13409]: GLIB WARNING ** GLib-GObject - invalid unclassed pointer in cast to `GObject'
- modest[13409]: GLIB WARNING ** GLib-GObject - instance with invalid (NULL) class pointer
- modest[13409]: GLIB CRITICAL ** GLib-GObject - g_signal_handler_disconnect: assertion `G_TYPE_CHECK_INSTANCE (instance)' failed
- */
- g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler);
+ /* TODO: This causes a g_warning and a valgrind mem error: */
+ /* g_signal_handler_disconnect (G_OBJECT (ppriv->notebook), priv->switch_handler);*/
priv->switch_handler = 0;
}
static ModestConnectedVia
current_connection (void)
{
- TnyAccountStore *account_store = NULL;
- TnyDevice *device = NULL;
- ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
-
- account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
- device = tny_account_store_get_device (account_store);
-
- if (!tny_device_is_online (device))
- return MODEST_CONNECTED_VIA_ANY;
-
- /* Get iap id */
- const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device));
- if (iap_id) {
- ConIcIap *iap = tny_maemo_conic_device_get_iap (
- TNY_MAEMO_CONIC_DEVICE (device), iap_id);
- const gchar *bearer_type = con_ic_iap_get_bearer_type (iap);
- if (bearer_type) {
- if (!strcmp (bearer_type, CON_IC_BEARER_WLAN_INFRA) ||
- !strcmp (bearer_type, CON_IC_BEARER_WLAN_ADHOC))
- retval = MODEST_CONNECTED_VIA_WLAN;
- else
- retval = MODEST_CONNECTED_VIA_ANY;
- }
-
- g_object_unref (iap);
- }
-
- g_object_unref (device);
-
- return retval;
+ return modest_platform_get_current_connection ();
}
static gboolean