/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
+ * Copyright (C) 1999-2013 Colin Leroy <colin@colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkcheckbutton.h>
#include <gtk/gtk.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
#include "utils.h"
#include "gtk/menu.h"
#include "plugin.h"
#include "folder.h"
#include "alertpanel.h"
#include "filesel.h"
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
#include "ssl.h"
#endif
#include "prefs_common.h"
#include "combobox.h"
-#ifdef MAEMO
-#include <libgnomevfs/gnome-vfs-volume.h>
-#include <libgnomevfs/gnome-vfs-volume-monitor.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-#endif
-
typedef enum
{
GO_BACK,
GtkWidget *recv_imap_subdir;
GtkWidget *subsonly_checkbtn;
GtkWidget *no_imap_warning;
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
GtkWidget *smtp_use_ssl;
GtkWidget *recv_use_ssl;
GtkWidget *smtp_use_tls;
GtkWidget *smtp_cert_table;
GtkWidget *recv_cert_table;
#endif
-
-#ifdef MAEMO
- GtkWidget *data_root_nokia_radiobtn;
- GtkWidget *data_root_mmc1_radiobtn;
- GtkWidget *data_root_mmc2_radiobtn;
- GnomeVFSVolumeMonitor *volmon;
- gulong volmon_mount_sigid;
- gulong volmon_unmount_sigid;
- GnomeVFSVolume *vol_mmc1;
- GnomeVFSVolume *vol_mmc2;
-#endif
gboolean create_mailbox;
gboolean finished;
gboolean result;
if (domain_name == NULL) {
domain_name = g_strdup(get_domain_name());
- if (strchr(domain_name, '.') != strrchr(domain_name, '.')
+ if (strchr(domain_name, '.') != NULL
+ && strchr(domain_name, '.') != strrchr(domain_name, '.')
&& strlen(strchr(domain_name, '.')) > 6) {
gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
g_free(domain_name);
static gchar *get_name_for_mail(void)
{
- gchar *name = g_strdup(tmpl.name);
- if (name == NULL)
+ gchar *name = NULL;
+ if (tmpl.name == NULL)
return NULL;
- g_utf8_strdown(name, -1);
+ name = g_utf8_strdown(tmpl.name, -1);
while(strstr(name, " "))
*strstr(name, " ")='.';
{
GtkWidget *widget = wizard->email;
gint size = pango_font_description_get_size(
- widget->style->font_desc)
+ gtk_widget_get_style(widget)->font_desc)
/PANGO_SCALE;
gchar *tmp, *new;
-
+#ifdef G_OS_WIN32
+ PangoFontDescription *bold_desc;
+ gchar *curfont = pango_font_description_to_string(widget->style->font_desc);
+ g_free(prefs_common.smallfont);
+ g_free(prefs_common.normalfont);
+ g_free(prefs_common.boldfont);
+ prefs_common.smallfont = g_strdup(curfont);
+ prefs_common.normalfont = g_strdup(curfont);
+ bold_desc = pango_font_description_from_string(curfont);
+ pango_font_description_set_weight(bold_desc, PANGO_WEIGHT_BOLD);
+ prefs_common.boldfont = pango_font_description_to_string(bold_desc);
+ pango_font_description_free(bold_desc);
+ g_free(curfont);
+#endif
tmp = g_strdup(prefs_common.textfont);
if (strrchr(tmp, ' ')) {
*(strrchr(tmp, ' ')) = '\0';
get_rfc822_date(buf_date, sizeof(buf_date));
conv_encode_header_full(enc_subject, sizeof(enc_subject),
- Q_("Welcome Mail Subject|Welcome to Claws Mail"),
+ C_("Welcome Mail Subject", "Welcome to Claws Mail"),
strlen("Subject: "), FALSE, CS_INTERNAL);
conv_encode_header_full(enc_to_name, sizeof(enc_to_name),
gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),
GList *account_list = NULL;
gchar *smtp_server, *recv_server;
gint smtp_port, recv_port;
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
SSLType smtp_ssl_type, recv_ssl_type;
#endif
return FALSE;
}
-#ifdef MAEMO
- if (wizard->create_mailbox) {
- g_free(prefs_common.data_root);
- if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn)))
- prefs_common.data_root = NULL;
- else if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_mmc1_radiobtn)))
- prefs_common.data_root = g_strdup(MMC1_PATH);
- else if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_mmc2_radiobtn)))
- prefs_common.data_root = g_strdup(MMC2_PATH);
- }
-#endif
-
if (!mailbox_ok) {
if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4) {
mailbox_ok = setup_write_mailbox_path(wizard->mainwin,
prefs_account->use_smtp_auth = TRUE;
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
smtp_ssl_type = SSL_NONE;
recv_ssl_type = SSL_NONE;
if (wizard->create_mailbox && prefs_account->protocol != A_IMAP4)
write_welcome_email(wizard);
-#ifdef MAEMO
- if (wizard->volmon_mount_sigid)
- g_signal_handler_disconnect(
- G_OBJECT(wizard->volmon),
- wizard->volmon_mount_sigid);
- if (wizard->volmon_unmount_sigid)
- g_signal_handler_disconnect(
- G_OBJECT(wizard->volmon),
- wizard->volmon_unmount_sigid);
-#endif
-
#ifndef G_OS_WIN32
plugin_load_standard_plugins();
#endif
{
GtkWidget *table = gtk_table_new(1,1, FALSE);
GtkWidget *vbox;
- GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *user_table;
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ user_table = gtk_table_new(3, 2, FALSE);
+ gtk_table_set_row_spacings(GTK_TABLE(user_table), VSPACING_NARROW);
+ gtk_box_pack_start(GTK_BOX(vbox), user_table, FALSE, FALSE, 0);
+
+ label = gtk_label_new(_("<span weight=\"bold\">Your name:</span>"));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(user_table), label, 0,1,0,1,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->full_name = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->full_name), tmpl.name?tmpl.name:"");
- PACK_BOX(hbox, _("<span weight=\"bold\">Your name:</span>"),
- wizard->full_name);
-
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(user_table), wizard->full_name, 1,2,0,1,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new(_("<span weight=\"bold\">Your email address:</span>"));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(user_table), label, 0,1,1,2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->email = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->email), tmpl.email?tmpl.email:"");
- PACK_BOX(hbox, _("<span weight=\"bold\">Your email address:</span>"),
- wizard->email);
-
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(user_table), wizard->email, 1,2,1,2,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+ label = gtk_label_new(_("Your organization:"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(user_table), label, 0,1,2,3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->organization = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->organization), tmpl.organization?tmpl.organization:"");
- PACK_BOX(hbox, _("Your organization:"), wizard->organization);
+ gtk_table_attach(GTK_TABLE(user_table), wizard->organization, 1,2,2,3,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
g_signal_connect(G_OBJECT(wizard->email), "changed",
G_CALLBACK(wizard_email_changed),
return table;
}
-#ifdef MAEMO
-static void wizard_vol_mount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, WizardWindow *wizard)
-{
- gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
- gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
- g_free (uri);
- if (mount_path) {
- if(!strcmp(mount_path, MMC1_PATH)) {
- gtk_widget_set_sensitive(wizard->data_root_mmc1_radiobtn, TRUE);
- }
- if(!strcmp(mount_path, MMC2_PATH)) {
- gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, TRUE);
- }
- }
- g_free(mount_path);
-}
-static void wizard_vol_unmount_cb(GnomeVFSVolumeMonitor *vfs, GnomeVFSVolume *vol, WizardWindow *wizard)
-{
- gchar *uri = gnome_vfs_volume_get_activation_uri (vol);
- gchar *mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
- g_free (uri);
- if (mount_path) {
- if(!strcmp(mount_path, MMC1_PATH)) {
- gtk_widget_set_sensitive(wizard->data_root_mmc1_radiobtn, FALSE);
- if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_mmc1_radiobtn))) {
- gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn), TRUE);
- }
- }
- if(!strcmp(mount_path, MMC2_PATH)) {
- gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, FALSE);
- if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_mmc2_radiobtn))) {
- gtk_toggle_button_set_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn), TRUE);
- }
- }
- }
- g_free(mount_path);
-}
-
-void data_root_changed (GtkToggleButton *toggle_btn,
- WizardWindow *wizard)
-{
- gchar *name = g_path_get_basename(gtk_entry_get_text(GTK_ENTRY(wizard->mailbox_name)));
- gchar *path = NULL;
- if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_nokia_radiobtn)))
- gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), name);
- else if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_mmc1_radiobtn))) {
- path = g_strconcat(MMC1_PATH, G_DIR_SEPARATOR_S,
- "Claws", G_DIR_SEPARATOR_S,
- g_get_user_name(), G_DIR_SEPARATOR_S,
- name, NULL);
- gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), path);
- g_free(path);
- } else if (gtk_toggle_button_get_active(
- GTK_TOGGLE_BUTTON(wizard->data_root_mmc2_radiobtn))) {
- path = g_strconcat(MMC2_PATH, G_DIR_SEPARATOR_S,
- "Claws", G_DIR_SEPARATOR_S,
- g_get_user_name(), G_DIR_SEPARATOR_S,
- name, NULL);
- gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), path);
- g_free(path);
- }
- g_free(name);
-}
-#endif
-
static GtkWidget* mailbox_page (WizardWindow * wizard)
{
GtkWidget *table = gtk_table_new(1,1, FALSE);
GtkWidget *vbox;
-#ifdef MAEMO
- GtkWidget *vbox2;
- gchar *uri, *mount_path;
-#endif
GtkWidget *hbox;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), wizard->mailbox_name, TRUE, TRUE, 0);
-#ifdef MAEMO
- wizard->data_root_nokia_radiobtn = gtk_radio_button_new_with_label(NULL,
- _("on internal memory"));
- wizard->data_root_mmc1_radiobtn = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn),
- _("on external memory card"));
- wizard->data_root_mmc2_radiobtn = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(wizard->data_root_nokia_radiobtn),
- _("on internal memory card"));
-
- g_signal_connect(G_OBJECT(wizard->data_root_nokia_radiobtn), "toggled",
- G_CALLBACK(data_root_changed), wizard);
- g_signal_connect(G_OBJECT(wizard->data_root_mmc1_radiobtn), "toggled",
- G_CALLBACK(data_root_changed), wizard);
- g_signal_connect(G_OBJECT(wizard->data_root_mmc2_radiobtn), "toggled",
- G_CALLBACK(data_root_changed), wizard);
-
- wizard->volmon = gnome_vfs_get_volume_monitor();
- wizard->vol_mmc1 = gnome_vfs_volume_monitor_get_volume_for_path(wizard->volmon, MMC1_PATH);
- wizard->vol_mmc2 = gnome_vfs_volume_monitor_get_volume_for_path(wizard->volmon, MMC2_PATH);
-
- uri = gnome_vfs_volume_get_activation_uri (wizard->vol_mmc1);
- mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
- g_free(uri);
- if (wizard->vol_mmc1 == NULL || !gnome_vfs_volume_is_mounted(wizard->vol_mmc1)
- || strcmp(mount_path, MMC1_PATH)) {
- gtk_widget_set_sensitive(wizard->data_root_mmc1_radiobtn, FALSE);
- }
- g_free(mount_path);
-
- uri = gnome_vfs_volume_get_activation_uri (wizard->vol_mmc2);
- mount_path = uri?gnome_vfs_get_local_path_from_uri (uri):NULL;
- g_free(uri);
- if (wizard->vol_mmc2 == NULL || !gnome_vfs_volume_is_mounted(wizard->vol_mmc2)
- || strcmp(mount_path, MMC2_PATH)) {
- gtk_widget_set_sensitive(wizard->data_root_mmc2_radiobtn, FALSE);
- } else {
- gtk_toggle_button_set_active(wizard->data_root_mmc2_radiobtn, TRUE);
- }
- g_free(mount_path);
-
- gnome_vfs_volume_unref(wizard->vol_mmc1);
- gnome_vfs_volume_unref(wizard->vol_mmc2);
- wizard->vol_mmc1 = NULL;
- wizard->vol_mmc2 = NULL;
-
- wizard->volmon_mount_sigid = g_signal_connect(G_OBJECT(wizard->volmon),
- "volume-mounted", G_CALLBACK(wizard_vol_mount_cb), wizard);
- wizard->volmon_unmount_sigid = g_signal_connect(G_OBJECT(wizard->volmon),
- "volume-unmounted", G_CALLBACK(wizard_vol_unmount_cb), wizard);
-
- vbox2 = gtk_vbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox2), wizard->data_root_nokia_radiobtn, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(vbox2), wizard->data_root_mmc1_radiobtn, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(vbox2), wizard->data_root_mmc2_radiobtn, FALSE, FALSE, 0);
-
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- PACK_BOX(hbox, _("<span weight=\"bold\">Store data</span>"),
- vbox2);
-#endif
-
return table;
}
gtk_widget_set_sensitive(wizard->smtp_password_label, do_auth);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
static void cert_browse_cb(GtkWidget *widget, gpointer data)
{
GtkEntry *dest = GTK_ENTRY(data);
GtkWidget *table = gtk_table_new(1, 1, FALSE);
GtkWidget *vbox;
GtkWidget *hbox;
+ GtkWidget *hbox_spc;
+ GtkWidget *smtp_auth_table;
GtkWidget *label;
+#ifdef USE_GNUTLS
GtkWidget *button;
GtkWidget *smtp_cert_table;
+#endif
gchar *text;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
PACK_BOX(hbox, _("<span weight=\"bold\">SMTP server address:</span>"),
wizard->smtp_server);
-
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->smtp_auth = gtk_check_button_new_with_label(
wizard);
gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_auth, FALSE, FALSE, 0);
- text = get_default_smtp_account(wizard);
+ label = gtk_label_new(_("<span size=\"small\">(empty to use the same as receive)</span>"));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ SET_TOGGLE_SENSITIVITY (wizard->smtp_auth, label);
+ gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0);
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ smtp_auth_table = gtk_table_new(2, 2, FALSE);
+ SET_TOGGLE_SENSITIVITY (wizard->smtp_auth, smtp_auth_table);
+ gtk_box_pack_start(GTK_BOX(hbox), smtp_auth_table, TRUE, TRUE, 0);
+
+ wizard->smtp_username_label = gtk_label_new(_("SMTP username:"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->smtp_username_label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_username_label, 0,1,0,1,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ text = get_default_smtp_account(wizard);
wizard->smtp_username = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_username), text);
g_free(text);
- wizard->smtp_username_label = gtk_label_new(_("SMTP username:\n"
- "<span size=\"small\">(empty to use the same as receive)</span>"));
- gtk_label_set_use_markup(GTK_LABEL(wizard->smtp_username_label), TRUE);
- if (GTK_IS_MISC(wizard->smtp_username_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->smtp_username_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_username_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_username, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_username, 1,2,0,1,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ wizard->smtp_password_label = gtk_label_new(_("SMTP password:"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password_label, 0,1,1,2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->smtp_password = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_password), tmpl.smtppass?tmpl.smtppass:"");
gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_password), FALSE);
-#ifdef MAEMO
- hildon_gtk_entry_set_input_mode(GTK_ENTRY(wizard->smtp_password),
- HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-#endif
- wizard->smtp_password_label = gtk_label_new(_("SMTP password:\n"
- "<span size=\"small\">(empty to use the same as receive)</span>"));
- gtk_label_set_use_markup(GTK_LABEL(wizard->smtp_password_label), TRUE);
- if (GTK_IS_MISC(wizard->smtp_password_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->smtp_password, TRUE, TRUE, 0);
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+ gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password, 1,2,1,2,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+#ifdef USE_GNUTLS
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->smtp_use_ssl = gtk_check_button_new_with_label(
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
wizard->smtp_use_tls = gtk_check_button_new_with_label(
_("Use SSL via STARTTLS"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_tls),
SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, wizard->smtp_use_tls);
smtp_cert_table = gtk_table_new(3,3, FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(smtp_cert_table), 8);
- gtk_box_pack_start (GTK_BOX(vbox), smtp_cert_table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), smtp_cert_table, FALSE, FALSE, 4);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Client SSL certificate (optional)"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_table_attach(GTK_TABLE(smtp_cert_table), label, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("File"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
- gtk_table_attach(GTK_TABLE(smtp_cert_table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->smtp_ssl_cert_file = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_ssl_cert_file), tmpl.smtpssl_cert?tmpl.smtpssl_cert:"");
gtk_table_attach(GTK_TABLE(smtp_cert_table), wizard->smtp_ssl_cert_file, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
button = gtkut_get_browse_file_btn(_("Browse"));
- gtk_table_attach(GTK_TABLE(smtp_cert_table), button, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
- SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, label);
- SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, wizard->smtp_ssl_cert_file);
- SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, button);
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), button, 2, 3, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(cert_browse_cb), wizard->smtp_ssl_cert_file);
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Password"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
- gtk_table_attach(GTK_TABLE(smtp_cert_table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 2, 3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->smtp_ssl_cert_pass = gtk_entry_new();
gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_ssl_cert_pass), FALSE);
gtk_entry_set_text(GTK_ENTRY(wizard->smtp_ssl_cert_pass), tmpl.smtpssl_cert_pass?tmpl.smtpssl_cert_pass:"");
gtk_table_attach(GTK_TABLE(smtp_cert_table), wizard->smtp_ssl_cert_pass, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
- SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, label);
- SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, wizard->smtp_ssl_cert_pass);
+ SET_TOGGLE_SENSITIVITY (wizard->smtp_use_ssl, smtp_cert_table);
wizard->smtp_cert_table = smtp_cert_table;
#endif
smtp_auth_changed(NULL, wizard);
gtk_widget_show(wizard->recv_username_label);
gtk_widget_show(wizard->recv_password_label);
gtk_widget_hide(wizard->no_imap_warning);
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_show(wizard->recv_use_ssl);
gtk_widget_show(wizard->recv_use_tls);
gtk_widget_show(wizard->recv_cert_table);
gtk_widget_show(wizard->recv_username_label);
gtk_widget_show(wizard->recv_password_label);
gtk_widget_hide(wizard->no_imap_warning);
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_show(wizard->recv_use_ssl);
gtk_widget_show(wizard->recv_use_tls);
gtk_widget_show(wizard->recv_cert_table);
gtk_widget_hide(wizard->mailbox_label);
gtk_widget_hide(wizard->mailbox_name);
}
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_hide(wizard->recv_use_ssl);
gtk_widget_hide(wizard->recv_use_tls);
gtk_widget_hide(wizard->recv_cert_table);
gtk_widget_hide(wizard->recv_password);
gtk_widget_hide(wizard->recv_username_label);
gtk_widget_hide(wizard->recv_password_label);
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+#ifdef USE_GNUTLS
gtk_widget_hide(wizard->recv_use_ssl);
gtk_widget_hide(wizard->recv_use_tls);
gtk_widget_hide(wizard->recv_cert_table);
GtkWidget *table = gtk_table_new(1,1, FALSE);
GtkWidget *vbox;
GtkWidget *hbox;
+ GtkWidget *hbox_spc;
+ GtkWidget *recv_table;
GtkWidget *label;
+#ifdef USE_GNUTLS
GtkWidget *button;
GtkWidget *recv_cert_table;
+#endif
GtkListStore *store;
GtkTreeIter iter;
gchar *text;
gint index = 0;
- CLAWS_TIP_DECL();
gtk_table_set_row_spacings(GTK_TABLE(table), 4);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
gtk_table_attach(GTK_TABLE(table), vbox, 0,1,1,2,
GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ recv_table = gtk_table_new(4, 2, FALSE);
+ gtk_box_pack_start(GTK_BOX(vbox), recv_table, FALSE, FALSE, 0);
+
+ label = gtk_label_new(_("<span weight=\"bold\">Server type:</span>"));
+ gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_table_attach(GTK_TABLE(recv_table), label, 0,1,0,1,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->recv_type = gtkut_sc_combobox_create(NULL, FALSE);
store = GTK_LIST_STORE(gtk_combo_box_get_model(
GTK_COMBO_BOX(wizard->recv_type)));
g_signal_connect(G_OBJECT(wizard->recv_type), "changed",
G_CALLBACK(wizard_protocol_changed),
wizard);
- PACK_BOX(hbox, _("<span weight=\"bold\">Server type:</span>"),
- wizard->recv_type);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_type, 1,2,0,1,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ wizard->recv_label = gtk_label_new(_("<span weight=\"bold\">Server address:</span>"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5);
+ gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_label, 0,1,1,2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->recv_server = gtk_entry_new();
text = get_default_server(wizard, "pop");
gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
CLAWS_SET_TIP(wizard->recv_server,
_("You can specify the port number by appending it at the end: "
"\"mail.example.com:110\""));
-
- wizard->recv_label = gtk_label_new(_("<span weight=\"bold\">Server address:</span>"));
- gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
- if (GTK_IS_MISC(wizard->recv_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_server, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_server, 1,2,1,2,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- wizard->recv_username = gtk_entry_new();
wizard->recv_username_label = gtk_label_new(_("<span weight=\"bold\">Username:</span>"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5);
gtk_label_set_use_markup(GTK_LABEL(wizard->recv_username_label), TRUE);
- if (GTK_IS_MISC(wizard->recv_username_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_username_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_username, TRUE, TRUE, 0);
-
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_username_label, 0,1,2,3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
+ wizard->recv_username = gtk_entry_new();
text = get_default_account(wizard);
gtk_entry_set_text(GTK_ENTRY(wizard->recv_username), text);
g_free(text);
-
- hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_username, 1,2,2,3,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+
+ wizard->recv_password_label = gtk_label_new(_("Password:"));
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password_label, 0,1,3,4,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->recv_password = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->recv_password), tmpl.recvpass?tmpl.recvpass:"");
- wizard->recv_password_label = gtk_label_new(_("Password:"));
- if (GTK_IS_MISC(wizard->recv_password_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);
gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_password), FALSE);
-#ifdef MAEMO
- hildon_gtk_entry_set_input_mode(GTK_ENTRY(wizard->recv_password),
- HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-#endif
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_password, TRUE, TRUE, 0);
-
-#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
+ gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password, 1,2,3,4,
+ GTK_EXPAND|GTK_FILL, 0, 0, 0);
+#ifdef USE_GNUTLS
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
wizard->recv_use_ssl = gtk_check_button_new_with_label(
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
wizard->recv_use_tls = gtk_check_button_new_with_label(
_("Use SSL via STARTTLS"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->recv_use_tls),
SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, wizard->recv_use_tls);
recv_cert_table = gtk_table_new(3,3, FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(recv_cert_table), 8);
- gtk_box_pack_start (GTK_BOX(vbox), recv_cert_table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), recv_cert_table, FALSE, FALSE, 4);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Client SSL certificate (optional)"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_table_attach(GTK_TABLE(recv_cert_table), label, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("File"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
- gtk_table_attach(GTK_TABLE(recv_cert_table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->recv_ssl_cert_file = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->recv_ssl_cert_file), tmpl.recvssl_cert?tmpl.recvssl_cert:"");
gtk_table_attach(GTK_TABLE(recv_cert_table), wizard->recv_ssl_cert_file, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
button = gtkut_get_browse_file_btn(_("Browse"));
- gtk_table_attach(GTK_TABLE(recv_cert_table), button, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
- SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, label);
- SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, wizard->recv_ssl_cert_file);
- SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, button);
+ gtk_table_attach(GTK_TABLE(recv_cert_table), button, 2, 3, 1, 2,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(cert_browse_cb), wizard->recv_ssl_cert_file);
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
label = gtk_label_new(_("Password"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
- gtk_table_attach(GTK_TABLE(recv_cert_table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 2, 3,
+ GTK_FILL, 0, VSPACING_NARROW, 0);
wizard->recv_ssl_cert_pass = gtk_entry_new();
gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_ssl_cert_pass), FALSE);
gtk_entry_set_text(GTK_ENTRY(wizard->recv_ssl_cert_pass), tmpl.recvssl_cert_pass?tmpl.recvssl_cert_pass:"");
gtk_table_attach(GTK_TABLE(recv_cert_table), wizard->recv_ssl_cert_pass, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
- SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, label);
- SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, wizard->recv_ssl_cert_pass);
+ SET_TOGGLE_SENSITIVITY (wizard->recv_use_ssl, recv_cert_table);
wizard->recv_cert_table = recv_cert_table;
#endif
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
wizard->recv_imap_subdir = gtk_entry_new();
gtk_entry_set_text(GTK_ENTRY(wizard->recv_imap_subdir), tmpl.imapdir?tmpl.imapdir:"");
wizard->recv_imap_label = gtk_label_new(_("IMAP server directory:"));
- if (GTK_IS_MISC(wizard->recv_imap_label))
- gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_subdir, TRUE, TRUE, 0);
hbox = gtk_hbox_new(FALSE, VSPACING_NARROW);
gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ hbox_spc = gtk_hbox_new (FALSE, 0);
+ gtk_widget_set_size_request (hbox_spc, 12, -1);
+ gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0);
wizard->subsonly_checkbtn = gtk_check_button_new_with_label(
_("Show only subscribed folders"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wizard->subsonly_checkbtn),
WizardWindow * wizard = (WizardWindow *)data;
int current_page, num_pages;
gboolean skip_mailbox_page = FALSE;
-#ifndef MAEMO
gint protocol = combobox_get_active_data(GTK_COMBO_BOX(wizard->recv_type));
if (protocol == A_IMAP4) {
skip_mailbox_page = TRUE;
}
-#endif
num_pages = g_slist_length(wizard->pages);
GTK_STOCK_CANCEL, CANCEL,
NULL);
gtk_widget_set_size_request(wizard->window, -1, 480);
+ gtk_window_set_position(GTK_WINDOW(wizard->window), GTK_WIN_POS_CENTER);
g_signal_connect(wizard->window, "response",
G_CALLBACK(wizard_response_cb), wizard);
wizard->notebook = gtk_notebook_new();
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(wizard->notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(wizard->notebook), FALSE);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(wizard->window)->vbox),
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(wizard->window))),
wizard->notebook, TRUE, TRUE, 0);
wizard->pages = NULL;
"Claws Mail in less than five minutes."));
widget = gtk_label_new(text);
gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE);
-#ifndef MAEMO
gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
-#else
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start(GTK_BOX(page), scrolled_window, TRUE, TRUE, 0);
-
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window),
- widget);
-#endif
g_free(text);
/* user page: 1 */
projects / claws.git / blobdiff