+2006-03-09 [wwp] 2.0.0cvs125
+
+ * src/addressadd.c
+ * src/foldersel.c
+ * src/prefs_common.c
+ * src/prefs_common.h
+ remember some more windows' sizes (add to addressbook and
+ select folder).
+
2006-03-09 [paul] 2.0.0cvs124
* src/plugins/pgpcore/prefs_gpg.c
( cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/plugins/trayicon/Makefile.am; ) > 2.0.0cvs122.patchset
( cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/trayicon/Makefile.am; ) > 2.0.0cvs123.patchset
( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/prefs_gpg.c; ) > 2.0.0cvs124.patchset
+( cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/addressadd.c; cvs diff -u -r 1.26.2.24 -r 1.26.2.25 src/foldersel.c; cvs diff -u -r 1.204.2.78 -r 1.204.2.79 src/prefs_common.c; cvs diff -u -r 1.103.2.44 -r 1.103.2.45 src/prefs_common.h; ) > 2.0.0cvs125.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=124
+EXTRA_VERSION=125
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
LIBETPAN_LIBS="`$libetpanconfig --libs`"
LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
- if test "$LIBETPAN_VERSION" -lt "041"; then
- AC_MSG_RESULT([*** Sylpheed requires libetpan 0.41 or newer. See http://www.etpan.org/])
+ if test "$LIBETPAN_VERSION" -lt "043"; then
+ AC_MSG_RESULT([*** Sylpheed requires libetpan 0.43 or newer. See http://www.etpan.org/])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
- AC_MSG_ERROR([libetpan 0.41 not found])
+ AC_MSG_ERROR([libetpan 0.43 not found])
fi
AC_SUBST(LIBETPAN_FLAGS)
AC_SUBST(LIBETPAN_LIBS)
AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
else
- AC_MSG_RESULT([*** Sylpheed requires libetpan 0.41 or newer. See http://www.etpan.org/ ])
+ AC_MSG_RESULT([*** Sylpheed requires libetpan 0.43 or newer. See http://www.etpan.org/ ])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
- AC_MSG_ERROR([libetpan 0.41 not found])
+ AC_MSG_ERROR([libetpan 0.43 not found])
fi
else
AC_MSG_RESULT(no)
return FALSE;
}
+static void addressadd_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.addressaddwin_width = allocation->width;
+ prefs_common.addressaddwin_height = allocation->height;
+}
+
static void addressadd_create( void ) {
GtkWidget *window;
GtkWidget *vbox;
GtkWidget *hsbox;
GtkWidget *statusbar;
gint top;
+ static GdkGeometry geometry;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_size_request( window, 300, 400 );
gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
gtk_window_set_title( GTK_WINDOW(window), _("Add to address book") );
gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
G_CALLBACK(addressadd_delete_event), NULL );
g_signal_connect( G_OBJECT(window), "key_press_event",
G_CALLBACK(addressadd_key_pressed), NULL );
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(addressadd_size_allocate_cb), NULL);
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
g_signal_connect(G_OBJECT(tree_folder), "button_press_event",
G_CALLBACK(addressadd_tree_button), NULL);
+ if (!geometry.min_height) {
+ geometry.min_width = 300;
+ geometry.min_height = 400;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.addressaddwin_width,
+ prefs_common.addressaddwin_height);
+
gtk_widget_show_all(vbox);
addressadd_dlg.window = window;
return NULL;
}
+static void foldersel_size_allocate_cb(GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ g_return_if_fail(allocation != NULL);
+
+ prefs_common.folderselwin_width = allocation->width;
+ prefs_common.folderselwin_height = allocation->height;
+}
+
static void foldersel_create(void)
{
GtkWidget *vbox;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
+ static GdkGeometry geometry;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
G_CALLBACK(delete_event), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(key_pressed), NULL);
+ g_signal_connect(G_OBJECT(window), "size_allocate",
+ G_CALLBACK(foldersel_size_allocate_cb), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_vbox_new(FALSE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_widget_set_size_request(scrolledwin, 300, 360);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
g_signal_connect(G_OBJECT(treeview), "row-activated",
G_CALLBACK(foldersel_tree_activated), NULL);
-
gtk_container_add(GTK_CONTAINER(scrolledwin), treeview);
column = gtk_tree_view_column_new();
g_signal_connect(G_OBJECT(new_button), "clicked",
G_CALLBACK(foldersel_new_folder), NULL);
+ if (!geometry.min_height) {
+ geometry.min_width = 300;
+ geometry.min_height = 360;
+ }
+
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+ gtk_widget_set_size_request(window, prefs_common.folderselwin_width,
+ prefs_common.folderselwin_height);
+
gtk_widget_show_all(vbox);
}
{"logwin_height", "-1", &prefs_common.logwin_height, P_INT,
NULL, NULL, NULL},
+ {"folderselwin_width", "300", &prefs_common.folderselwin_width, P_INT,
+ NULL, NULL, NULL},
+ {"folderselwin_height", "-1", &prefs_common.folderselwin_height, P_INT,
+ NULL, NULL, NULL},
+
+ {"addressaddwin_width", "300", &prefs_common.addressaddwin_width, P_INT,
+ NULL, NULL, NULL},
+ {"addressaddwin_height", "-1", &prefs_common.addressaddwin_height, P_INT,
+ NULL, NULL, NULL},
+
/* Hidden */
{"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
NULL, NULL, NULL},
gint accountswin_height;
gint logwin_width;
gint logwin_height;
+ gint folderselwin_width;
+ gint folderselwin_height;
+ gint addressaddwin_width;
+ gint addressaddwin_height;
gint warn_dnd;
gint broken_are_utf8;