HildonNumberEditorErrorType type,
gpointer user_data);
+static void on_size_notify (HildonNumberEditor *editor,
+ GParamSpec *arg1,
+ gpointer user_data);
+
static void on_auto_update_toggled (GtkToggleButton *togglebutton,
gpointer user_data);
/* Grab focus, we need to block in order to prevent a
recursive call to this callback */
g_signal_handler_block (G_OBJECT (ppriv->notebook), priv->switch_handler);
- gdk_threads_enter ();
+
+ /* This is a GDK lock because we are an idle callback and
+ * the code below is or does Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
gtk_widget_grab_focus (helper->focus_widget);
- gdk_threads_leave ();
+ gdk_threads_leave (); /* CHECKED */
+
g_signal_handler_unblock (G_OBJECT (ppriv->notebook), priv->switch_handler);
g_free (helper);
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);
+
g_signal_connect (G_OBJECT (self), "key-press-event",
G_CALLBACK (on_inner_tabs_key_pressed), self);
priv->switch_handler = g_signal_connect (G_OBJECT(ppriv->notebook), "switch-page",
priv = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (obj);
- if (priv->switch_handler) {
+ 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);
priv->switch_handler = 0;
}
return GTK_WIDGET(g_object_new(MODEST_TYPE_MAEMO_GLOBAL_SETTINGS_DIALOG, NULL));
}
-
/*
* Creates the updating page
*/
GtkWidget *vbox, *vbox_update, *vbox_limit, *caption;
GtkSizeGroup *size_group;
ModestGlobalSettingsDialogPrivate *ppriv;
+ GtkWidget *scrollwin = NULL;
+ GtkAdjustment *focus_adjustment = NULL;
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
+ scrollwin = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);
hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);
g_signal_connect (ppriv->size_limit, "range_error", G_CALLBACK (on_range_error), self);
+ g_signal_connect (ppriv->size_limit, "notify", G_CALLBACK (on_size_notify), self);
caption = hildon_caption_new (size_group,
_("mcen_fi_advsetup_sizelimit"),
- ppriv->size_limit,
+ ppriv->size_limit,
NULL,
HILDON_CAPTION_MANDATORY);
gtk_box_pack_start (GTK_BOX (vbox_limit), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
/* Add to vbox */
gtk_box_pack_start (GTK_BOX (vbox), vbox_limit, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), vbox);
+ focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin));
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (vbox), focus_adjustment);
+ gtk_widget_show (scrollwin);
- return vbox;
+ return scrollwin;
}
/*
HILDON_CAPTION_MANDATORY);
gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
- /* Reply */
- ppriv->include_reply = gtk_check_button_new ();
- caption = hildon_caption_new (size_group,
- _("mcen_va_options_include_original_inreply"),
- ppriv->include_reply,
- NULL,
- HILDON_CAPTION_MANDATORY);
- gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
-
return vbox;
}
#else
case HILDON_NUMBER_EDITOR_ERROR_MAXIMUM_VALUE_EXCEED:
#endif
- msg = g_strdup_printf (_("ckct_ib_maximum_value"), MSG_SIZE_MAX_VAL);
+ msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_maximum_value"), MSG_SIZE_MAX_VAL);
new_val = MSG_SIZE_MAX_VAL;
break;
#ifdef MODEST_HAVE_HILDON0_WIDGETS
#else
case HILDON_NUMBER_EDITOR_ERROR_MINIMUM_VALUE_EXCEED:
#endif
- msg = g_strdup_printf (_("ckct_ib_minimum_value"), MSG_SIZE_MIN_VAL);
+ msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_minimum_value"), MSG_SIZE_MIN_VAL);
new_val = MSG_SIZE_MIN_VAL;
break;
#ifdef MODEST_HAVE_HILDON0_WIDGETS
#else
case HILDON_NUMBER_EDITOR_ERROR_ERRONEOUS_VALUE:
#endif
- msg = g_strdup_printf (_("ckct_ib_set_a_value_within_range"),
+ msg = g_strdup_printf (dgettext("hildon-libs", "ckct_ib_set_a_value_within_range"),
MSG_SIZE_MIN_VAL,
MSG_SIZE_MAX_VAL);
/* FIXME: use the previous */
return TRUE;
}
+static void
+on_size_notify (HildonNumberEditor *editor,
+ GParamSpec *arg1,
+ gpointer user_data)
+{
+ ModestMaemoGlobalSettingsDialog *dialog = MODEST_MAEMO_GLOBAL_SETTINGS_DIALOG (user_data);
+ gint value = hildon_number_editor_get_value (editor);
+
+ gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, value > 0);
+}
+
static ModestConnectedVia
current_connection (void)
{
- TnyAccountStore *account_store;
- TnyDevice *device;
+ TnyAccountStore *account_store = NULL;
+ TnyDevice *device = NULL;
ModestConnectedVia retval = MODEST_CONNECTED_VIA_ANY;
account_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
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 (!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;
+ 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;