2005-05-05 [paul] 1.9.6cvs52
authorPaul Mangan <paul@claws-mail.org>
Thu, 5 May 2005 08:18:20 +0000 (08:18 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 5 May 2005 08:18:20 +0000 (08:18 +0000)
* src/account.c
* src/addrgather.c
* src/browseldap.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/importmutt.c
* src/importpine.c
* src/main.c
* src/mainwindow.c
* src/noticeview.c
* src/prefs_filtering.c
* src/prefs_filtering_action.c
* src/prefs_matcher.c
* src/prefs_spelling.c
* src/prefs_toolbar.c
* src/toolbar.c
* src/wizard.c
* src/gtk/description_window.c
* src/gtk/gtkvscrollbutton.c
* src/gtk/progressdialog.c
* src/gtk/quicksearch.c
* src/plugins/pgpmime/prefs_gpg.c
* src/plugins/spamassassin/spamassassin_gtk.c
replace deprecated gtk_widget_set_usize

26 files changed:
ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/account.c
src/addrgather.c
src/browseldap.c
src/exphtmldlg.c
src/expldifdlg.c
src/gtk/description_window.c
src/gtk/gtkvscrollbutton.c
src/gtk/progressdialog.c
src/gtk/quicksearch.c
src/importmutt.c
src/importpine.c
src/main.c
src/mainwindow.c
src/noticeview.c
src/plugins/pgpmime/prefs_gpg.c
src/plugins/spamassassin/spamassassin_gtk.c
src/prefs_filtering.c
src/prefs_filtering_action.c
src/prefs_matcher.c
src/prefs_spelling.c
src/prefs_toolbar.c
src/toolbar.c
src/wizard.c

index f88946d..4f7e18c 100644 (file)
@@ -1,3 +1,30 @@
+2005-05-05 [paul]      1.9.6cvs52
+
+       * src/account.c
+       * src/addrgather.c
+       * src/browseldap.c
+       * src/exphtmldlg.c
+       * src/expldifdlg.c
+       * src/importmutt.c
+       * src/importpine.c
+       * src/main.c
+       * src/mainwindow.c
+       * src/noticeview.c
+       * src/prefs_filtering.c
+       * src/prefs_filtering_action.c
+       * src/prefs_matcher.c
+       * src/prefs_spelling.c
+       * src/prefs_toolbar.c
+       * src/toolbar.c
+       * src/wizard.c
+       * src/gtk/description_window.c
+       * src/gtk/gtkvscrollbutton.c
+       * src/gtk/progressdialog.c
+       * src/gtk/quicksearch.c
+       * src/plugins/pgpmime/prefs_gpg.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               replace deprecated gtk_widget_set_usize
+
 2005-05-04 [colin]     1.9.6cvs51
 
        * src/common/utils.c
index 920e3c0..9bdfcf2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.49.2.38 -r 1.49.2.39 src/procmime.c; ) > 1.9.6cvs49.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/partial_download.c; cvs diff -u -r 1.56.2.33 -r 1.56.2.34 src/pop.c; ) > 1.9.6cvs50.patchset
 ( cvs diff -u -r 1.36.2.28 -r 1.36.2.29 src/common/utils.c; ) > 1.9.6cvs51.patchset
+( cvs diff -u -r 1.61.2.23 -r 1.61.2.24 src/account.c; cvs diff -u -r 1.5.10.8 -r 1.5.10.9 src/addrgather.c; cvs diff -u -r 1.2.4.6 -r 1.2.4.7 src/browseldap.c; cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/exphtmldlg.c; cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/expldifdlg.c; cvs diff -u -r 1.4.12.5 -r 1.4.12.6 src/importmutt.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/importpine.c; cvs diff -u -r 1.115.2.31 -r 1.115.2.32 src/main.c; cvs diff -u -r 1.274.2.35 -r 1.274.2.36 src/mainwindow.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/noticeview.c; cvs diff -u -r 1.59.2.16 -r 1.59.2.17 src/prefs_filtering.c; cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.17 -r 1.43.2.18 src/prefs_matcher.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/prefs_spelling.c; cvs diff -u -r 1.30.2.11 -r 1.30.2.12 src/prefs_toolbar.c; cvs diff -u -r 1.43.2.15 -r 1.43.2.16 src/toolbar.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/wizard.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/description_window.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/gtk/progressdialog.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.23.2.8 -r 1.23.2.9 src/plugins/spamassassin/spamassassin_gtk.c; ) > 1.9.6cvs52.patchset
index ff0025f..0cb7918 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=51
+EXTRA_VERSION=52
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index b08259d..14af453 100644 (file)
@@ -621,7 +621,7 @@ static void account_edit_create(void)
        debug_print("Creating account edit window...\n");
 
        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_usize (window, 500, 350);
+       gtk_widget_set_size_request (window, 500, 350);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
        gtk_window_set_title (GTK_WINDOW (window), _("Edit accounts"));
        gtk_window_set_modal (GTK_WINDOW (window), TRUE);
index 029c2ff..d6b5397 100644 (file)
@@ -373,7 +373,7 @@ static void addrgather_page_fields( gint pageNum, gchar *pageLbl ) {
                gtk_adjustment_new( DFL_FOLDER_SIZE, MIN_FOLDER_SIZE, G_MAXINT, 1, 10, 100 );
        spinbtnFolder = gtk_spin_button_new( GTK_ADJUSTMENT(adjFolder), 1, 0 );
        gtk_box_pack_start( GTK_BOX(hboxs), spinbtnFolder, FALSE, FALSE, 0);
-       gtk_widget_set_usize( spinbtnFolder, 100, -1);
+       gtk_widget_set_size_request( spinbtnFolder, 100, -1);
        gtk_spin_button_set_numeric( GTK_SPIN_BUTTON(spinbtnFolder), TRUE );
        gtk_table_attach( GTK_TABLE(table), hboxs, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0 );
 
@@ -472,7 +472,7 @@ static void addrgather_dlg_create( void ) {
        GtkWidget *hsbox;
 
        window = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-       gtk_widget_set_usize( window, 380, -1 );
+       gtk_widget_set_size_request( window, 380, -1 );
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_CENTER );
        gtk_window_set_modal( GTK_WINDOW(window), TRUE );       
index 1e7d270..05cde68 100644 (file)
@@ -233,7 +233,7 @@ static void browse_create( void ) {
        gint top;
 
        window = gtk_dialog_new();
-       gtk_widget_set_usize( window, BROWSELDAP_WIDTH, BROWSELDAP_HEIGHT );
+       gtk_widget_set_size_request( window, BROWSELDAP_WIDTH, BROWSELDAP_HEIGHT );
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Browse Directory Entry") );
        gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
index e658132..c190a48 100644 (file)
@@ -686,7 +686,7 @@ static void export_html_dialog_create( void ) {
        GtkWidget *statusbar;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_usize(window, EXPORTHTML_WIDTH, EXPORTHTML_HEIGHT );
+       gtk_widget_set_size_request(window, EXPORTHTML_WIDTH, EXPORTHTML_HEIGHT );
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window),
                _("Export Address Book to HTML File") );
index 679936a..b2d7a87 100644 (file)
@@ -707,7 +707,7 @@ static void export_ldif_dialog_create( void ) {
        GtkWidget *statusbar;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_usize(window, EXPORTLDIF_WIDTH, EXPORTLDIF_HEIGHT );
+       gtk_widget_set_size_request(window, EXPORTLDIF_WIDTH, EXPORTLDIF_HEIGHT );
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window),
                _("Export Address Book to LDIF File") );
index 8ab74a4..37389b4 100644 (file)
@@ -59,7 +59,7 @@ static void description_create(DescriptionWindow * dwindow)
        int j;
 
        dwindow->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_usize(dwindow->window,400,450);
+       gtk_widget_set_size_request(dwindow->window,400,450);
        
        gtk_window_set_title(GTK_WINDOW(dwindow->window),
                             gettext(dwindow->title));
index 729184c..083661d 100644 (file)
@@ -123,11 +123,11 @@ static void gtk_vscrollbutton_init(GtkVScrollbutton *scrollbutton)
     arrow = gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_NONE);
     gtk_widget_show(arrow);
     gtk_container_add(GTK_CONTAINER(scrollbutton->upbutton), arrow);
-    gtk_widget_set_usize(scrollbutton->upbutton, -1, 16);
+    gtk_widget_set_size_request(scrollbutton->upbutton, -1, 16);
     arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
     gtk_widget_show(arrow);
     gtk_container_add(GTK_CONTAINER(scrollbutton->downbutton), arrow);
-    gtk_widget_set_usize(scrollbutton->downbutton, -1, 16);
+    gtk_widget_set_size_request(scrollbutton->downbutton, -1, 16);
     GTK_WIDGET_UNSET_FLAGS(scrollbutton->upbutton, GTK_CAN_FOCUS);
     GTK_WIDGET_UNSET_FLAGS(scrollbutton->downbutton, GTK_CAN_FOCUS);
     gtk_widget_show(scrollbutton->downbutton);
index dd4e8e9..626e917 100644 (file)
@@ -117,7 +117,7 @@ ProgressDialog *progress_dialog_create(void)
        clist = gtk_clist_new_with_titles(3, text);
        gtk_widget_hide(clist);
        /* gtk_container_add(GTK_CONTAINER(scrolledwin), clist); */
-       /* gtk_widget_set_usize(clist, -1, 120); */
+       /* gtk_widget_set_size_request(clist, -1, 120); */
        gtk_clist_set_column_justification(GTK_CLIST(clist), 0,
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_width(GTK_CLIST(clist), 0, 16);
@@ -126,7 +126,7 @@ ProgressDialog *progress_dialog_create(void)
        list_view = progress_dialog_list_view_create();
        gtk_widget_show(list_view);
        gtk_container_add(GTK_CONTAINER(scrolledwin), list_view);
-       gtk_widget_set_usize(list_view, -1, 120);
+       gtk_widget_set_size_request(list_view, -1, 120);
 
        progress->window      = dialog;
        progress->label       = label;
index 3fbd86f..8146d20 100644 (file)
@@ -349,7 +349,7 @@ QuickSearch *quicksearch_new()
                clear_search = gtk_button_new_with_label(_("Clear"));
                gtk_box_pack_start(GTK_BOX(search_hbbox), clear_search,
                                   FALSE, FALSE, 0);
-               gtk_widget_set_usize(clear_search, 120, -1);
+               gtk_widget_set_size_request(clear_search, 120, -1);
                g_signal_connect(G_OBJECT(clear_search), "clicked",
                                 G_CALLBACK(clear_search_cb), quicksearch);
                gtk_widget_show(clear_search);
index 0d110bf..0456a68 100644 (file)
@@ -237,7 +237,7 @@ static void imp_mutt_create( gboolean *cancelled ) {
        gint top;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_usize(window, 450, -1);
+       gtk_widget_set_size_request(window, 450, -1);
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Import MUTT file into Address Book") );
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
index 80afee6..173aeff 100644 (file)
@@ -237,7 +237,7 @@ static void imp_pine_create( gboolean *cancelled ) {
        gint top;
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_widget_set_usize(window, 450, -1);
+       gtk_widget_set_size_request(window, 450, -1);
        gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
        gtk_window_set_title( GTK_WINDOW(window), _("Import Pine file into Address Book") );
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
index 9edeafd..923c778 100644 (file)
@@ -189,7 +189,7 @@ static void startup_notification_complete(gboolean with_window)
                 * We have to display a window, so let it be very little */
                hack = gtk_window_new(GTK_WINDOW_POPUP);
                gtk_widget_set_uposition(hack, 0, 0);
-               gtk_widget_set_usize(hack, 1, 1);
+               gtk_widget_set_size_request(hack, 1, 1);
                gtk_widget_show(hack);
        }
 
index b2ae490..163e591 100644 (file)
@@ -1937,13 +1937,13 @@ void main_window_show(MainWindow *mainwin)
                                  prefs_common.mainwin_x,
                                  prefs_common.mainwin_y);
 
-       gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->folderview),
+       gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->folderview),
                             prefs_common.folderview_width,
                             prefs_common.folderview_height);
-       gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->summaryview),
+       gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->summaryview),
                             prefs_common.summaryview_width,
                             prefs_common.summaryview_height);
-       gtk_widget_set_usize(GTK_WIDGET_PTR(mainwin->messageview),
+       gtk_widget_set_size_request(GTK_WIDGET_PTR(mainwin->messageview),
                             prefs_common.msgview_width,
                             prefs_common.msgview_height);
 
@@ -2261,13 +2261,13 @@ static gboolean toolbar_account_button_pressed(GtkWidget *widget,
 static void toolbar_child_attached(GtkWidget *widget, GtkWidget *child,
                                   gpointer data)
 {
-       gtk_widget_set_usize(child, 1, -1);
+       gtk_widget_set_size_request(child, 1, -1);
 }
 
 static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
                                   gpointer data)
 {
-       gtk_widget_set_usize(child, -1, -1);
+       gtk_widget_set_size_request(child, -1, -1);
 }
 
 static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
index 165eb7f..6247f24 100644 (file)
@@ -87,14 +87,14 @@ NoticeView *noticeview_create(MainWindow *mainwin)
        gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 0);
 
        widget = gtk_button_new_with_label("");
-       gtk_widget_set_usize(widget, 120, -1);
+       gtk_widget_set_size_request(widget, 120, -1);
        g_signal_connect(G_OBJECT(widget), "clicked", 
                         G_CALLBACK(noticeview_button_pressed),
                         (gpointer) noticeview);
        gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 4);
        
        widget2 = gtk_button_new_with_label("");
-       gtk_widget_set_usize(widget2, 120, -1);
+       gtk_widget_set_size_request(widget2, 120, -1);
        g_signal_connect(G_OBJECT(widget2), "clicked", 
                         G_CALLBACK(noticeview_2ndbutton_pressed),
                         (gpointer) noticeview);
index 4a603b9..dcc27bb 100644 (file)
@@ -168,7 +168,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
        gtk_widget_show(spinbtn_store_passphrase);
        gtk_box_pack_start(GTK_BOX(hbox1), spinbtn_store_passphrase, FALSE,
                           FALSE, 0);
-       gtk_widget_set_usize(spinbtn_store_passphrase, 64, -2);
+       gtk_widget_set_size_request(spinbtn_store_passphrase, 64, -2);
        gtk_tooltips_set_tip(tooltips, spinbtn_store_passphrase,
                             _
                             ("Setting to '0' will store the passphrase for the whole session"),
index 8a9bfb2..695e6ad 100644 (file)
@@ -231,7 +231,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        port = gtk_spin_button_new(GTK_ADJUSTMENT(port_adj), 1, 0);
        gtk_widget_show(port);
        gtk_box_pack_end(GTK_BOX(hbox1), port, FALSE, TRUE, 0);
-       gtk_widget_set_usize(port, 64, -2);
+       gtk_widget_set_size_request(port, 64, -2);
        gtk_tooltips_set_tip(tooltips, port, _("Port of spamd server"),
                             NULL);
        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(port), TRUE);
@@ -259,7 +259,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        timeout = gtk_spin_button_new(GTK_ADJUSTMENT(timeout_adj), 1, 0);
        gtk_widget_show(timeout);
        gtk_box_pack_end(GTK_BOX(hbox6), timeout, FALSE, TRUE, 0);
-       gtk_widget_set_usize(timeout, 64, -2);
+       gtk_widget_set_size_request(timeout, 64, -2);
        gtk_tooltips_set_tip(tooltips, timeout,
                             _
                             ("Time that is allowed for checking. If the check takes longer the check will be aborted and the message will be handled as not spam."),
@@ -300,7 +300,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
        max_size = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_adj), 1, 0);
        gtk_widget_show(max_size);
        gtk_box_pack_end(GTK_BOX(hbox3), max_size, FALSE, TRUE, 0);
-       gtk_widget_set_usize(max_size, 64, -2);
+       gtk_widget_set_size_request(max_size, 64, -2);
        gtk_tooltips_set_tip(tooltips, max_size,
                             _
                             ("Maximum size a message is allowed to have to be checked"),
index 0cce487..b2584bf 100644 (file)
@@ -304,7 +304,7 @@ static void prefs_filtering_create(void)
        arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        gtk_widget_show (arrow);
        gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize (arrow, -1, 16);
+       gtk_widget_set_size_request (arrow, -1, 16);
 
        btn_hbox = gtk_hbox_new (TRUE, 4);
        gtk_widget_show (btn_hbox);
@@ -335,7 +335,7 @@ static void prefs_filtering_create(void)
 
        cond_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
        gtk_widget_show (cond_scrolledwin);
-       gtk_widget_set_usize (cond_scrolledwin, -1, 150);
+       gtk_widget_set_size_request (cond_scrolledwin, -1, 150);
        gtk_box_pack_start (GTK_BOX (cond_hbox), cond_scrolledwin,
                            TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (cond_scrolledwin),
@@ -385,8 +385,8 @@ static void prefs_filtering_create(void)
 
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
                                      GDK_HINT_MIN_SIZE);
-       gtk_widget_set_usize(window, prefs_common.filteringwin_width, 
-                                    prefs_common.filteringwin_height);
+       gtk_widget_set_size_request(window, prefs_common.filteringwin_width,
+                                   prefs_common.filteringwin_height);
 
        gtk_widget_show_all(window);
 
index daefcb6..fd704db 100644 (file)
@@ -362,7 +362,7 @@ static void prefs_filtering_action_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), account_label, FALSE, FALSE, 0);
 
        account_combo = gtk_combo_new ();
-       gtk_widget_set_usize (account_combo, 150, -1);
+       gtk_widget_set_size_request (account_combo, 150, -1);
        gtk_widget_show (account_combo);
 
        combo_items = NULL;
@@ -423,7 +423,7 @@ static void prefs_filtering_action_create(void)
        gtk_box_pack_start (GTK_BOX (hbox1), score_label, FALSE, FALSE, 0);
 
        dest_entry = gtk_entry_new ();
-       gtk_widget_set_usize (dest_entry, 150, -1);
+       gtk_widget_set_size_request (dest_entry, 150, -1);
        gtk_widget_show (dest_entry);
        gtk_box_pack_start (GTK_BOX (hbox1), dest_entry, TRUE, TRUE, 0);
        
@@ -455,7 +455,7 @@ static void prefs_filtering_action_create(void)
        arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        gtk_widget_show(arrow);
        gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize(arrow, -1, 16);
+       gtk_widget_set_size_request(arrow, -1, 16);
 
        btn_hbox = gtk_hbox_new(TRUE, 4);
        gtk_widget_show(btn_hbox);
@@ -486,7 +486,7 @@ static void prefs_filtering_action_create(void)
 
        action_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(action_scrolledwin);
-       gtk_widget_set_usize(action_scrolledwin, -1, 150);
+       gtk_widget_set_size_request(action_scrolledwin, -1, 150);
        gtk_box_pack_start(GTK_BOX(action_hbox), action_scrolledwin,
                           TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(action_scrolledwin),
index 5d503a5..2276b75 100644 (file)
@@ -438,7 +438,7 @@ static void prefs_matcher_create(void)
 
        g_list_free(combo_items);
 
-       gtk_widget_set_usize(criteria_combo, 120, -1);
+       gtk_widget_set_size_request(criteria_combo, 120, -1);
        gtk_table_attach(GTK_TABLE(criteria_table), criteria_combo, 0, 1, 1, 2,
                          0, 0, 0, 0);
        criteria_list = GTK_COMBO(criteria_combo)->list;
@@ -459,7 +459,7 @@ static void prefs_matcher_create(void)
 
        header_combo = gtk_combo_new();
        gtk_widget_show(header_combo);
-       gtk_widget_set_usize(header_combo, 96, -1);
+       gtk_widget_set_size_request(header_combo, 96, -1);
        gtkut_combo_set_items(GTK_COMBO (header_combo),
                              "Subject", "From", "To", "Cc", "Reply-To",
                              "Sender", "X-ML-Name", "X-List", "X-Sequence",
@@ -480,7 +480,7 @@ static void prefs_matcher_create(void)
 
        value_entry = gtk_entry_new();
        gtk_widget_show(value_entry);
-       gtk_widget_set_usize(value_entry, 200, -1);
+       gtk_widget_set_size_request(value_entry, 200, -1);
        gtk_table_attach(GTK_TABLE(criteria_table), value_entry, 2, 3, 1, 2,
                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
 
@@ -513,7 +513,7 @@ static void prefs_matcher_create(void)
 
        predicate_combo = gtk_combo_new();
        gtk_widget_show(predicate_combo);
-       gtk_widget_set_usize(predicate_combo, 120, -1);
+       gtk_widget_set_size_request(predicate_combo, 120, -1);
        predicate_list = GTK_COMBO(predicate_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_combo)->entry),
                               FALSE);
@@ -535,7 +535,7 @@ static void prefs_matcher_create(void)
 
        predicate_flag_combo = gtk_combo_new();
        gtk_widget_hide(predicate_flag_combo);
-       gtk_widget_set_usize(predicate_flag_combo, 120, -1);
+       gtk_widget_set_size_request(predicate_flag_combo, 120, -1);
        predicate_flag_list = GTK_COMBO(predicate_flag_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_flag_combo)->entry), FALSE);
 
@@ -568,7 +568,7 @@ static void prefs_matcher_create(void)
        arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        gtk_widget_show(arrow);
        gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize(arrow, -1, 16);
+       gtk_widget_set_size_request(arrow, -1, 16);
 
        btn_hbox = gtk_hbox_new(TRUE, 4);
        gtk_widget_show(btn_hbox);
@@ -603,7 +603,7 @@ static void prefs_matcher_create(void)
 
        bool_op_combo = gtk_combo_new();
        gtk_widget_show(bool_op_combo);
-       gtk_widget_set_usize(bool_op_combo, 50, -1);
+       gtk_widget_set_size_request(bool_op_combo, 50, -1);
        bool_op_list = GTK_COMBO(bool_op_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(bool_op_combo)->entry),
                               FALSE);
@@ -627,7 +627,7 @@ static void prefs_matcher_create(void)
 
        cond_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(cond_scrolledwin);
-       gtk_widget_set_usize(cond_scrolledwin, -1, 150);
+       gtk_widget_set_size_request(cond_scrolledwin, -1, 150);
        gtk_box_pack_start(GTK_BOX(cond_hbox), cond_scrolledwin,
                           TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(cond_scrolledwin),
@@ -1371,7 +1371,7 @@ static void prefs_matcher_set_value_widget(GtkWidget *old_widget,
        gtk_widget_ref(old_widget);
        gtkut_container_remove(GTK_CONTAINER(matcher.criteria_table), old_widget);
        gtk_widget_show(new_widget);
-       gtk_widget_set_usize(new_widget, 200, -1);
+       gtk_widget_set_size_request(new_widget, 200, -1);
        gtk_table_attach(GTK_TABLE(matcher.criteria_table), new_widget, 
                         2, 3, 1, 2, 
                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 
index 700cefa..5468605 100644 (file)
@@ -257,7 +257,7 @@ void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer
        gtk_widget_show(misspelled_btn);
        gtk_box_pack_start(GTK_BOX(hbox1), misspelled_btn, FALSE, FALSE,
                           0);
-       gtk_widget_set_usize(misspelled_btn, 30, 20);
+       gtk_widget_set_size_request(misspelled_btn, 30, 20);
        /* END GLADE CODE */
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_aspell),
index 239be15..f3d6ec9 100644 (file)
@@ -712,7 +712,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        gtk_widget_show(list_view_icons);
        gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_icons), list_view_icons);
        gtk_container_set_border_width(GTK_CONTAINER(list_view_icons), 1);
-       gtk_widget_set_usize(list_view_icons, 225, 108); 
+       gtk_widget_set_size_request(list_view_icons, 225, 108);
 
        table = gtk_table_new (2, 3, FALSE);
        gtk_container_add (GTK_CONTAINER (vbox_frame), table);
@@ -774,7 +774,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 
        arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize(arrow, -1, 16);
+       gtk_widget_set_size_request(arrow, -1, 16);
 
        btn_hbox = gtk_hbox_new(TRUE, 4);
        gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
@@ -820,7 +820,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        list_view_set = create_set_list_view(prefs_toolbar); 
        gtk_widget_show(list_view_set);
        gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_set), list_view_set);
-       gtk_widget_set_usize(list_view_set, 225, 120);
+       gtk_widget_set_size_request(list_view_set, 225, 120);
 
        btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
index bc6bf87..bced7f0 100644 (file)
@@ -778,7 +778,7 @@ void toolbar_set_style(GtkWidget *toolbar_wid, GtkWidget *handlebox_wid, guint a
        }
 
        prefs_common.toolbar_style = (ToolbarStyle)action;
-       gtk_widget_set_usize(handlebox_wid, 1, -1);
+       gtk_widget_set_size_request(handlebox_wid, 1, -1);
        
        if (prefs_common.toolbar_style != TOOLBAR_NONE) {
                gtk_widget_show(handlebox_wid);
index de65531..84b7763 100644 (file)
@@ -175,7 +175,7 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
 
        /* pack space */
        w = gtk_alignment_new (0, 0, 0, 0);
-       gtk_widget_set_usize (w, 0, 6);
+       gtk_widget_set_size_request (w, 0, 6);
        gtk_box_pack_start (GTK_BOX(vbox), w, FALSE, FALSE, 0);
 
        return vbox;