2004-11-18 [paul] 0.9.12cvs158.2
authorPaul Mangan <paul@claws-mail.org>
Thu, 18 Nov 2004 07:11:16 +0000 (07:11 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 18 Nov 2004 07:11:16 +0000 (07:11 +0000)
* src/addrgather.c
* src/exphtmldlg.c
* src/expldifdlg.c
* src/mimeview.c
* src/prefs_common.c
* src/plugins/image_viewer/viewer.c
* src/plugins/spamassassin/spamassassin_gtk.c
replace deprecated gtk_notebook_set_page
and gtk_notebook_current_page

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/addrgather.c
src/exphtmldlg.c
src/expldifdlg.c
src/mimeview.c
src/plugins/image_viewer/viewer.c
src/plugins/spamassassin/spamassassin_gtk.c
src/prefs_common.c

index 6585ed0..8f062f9 100644 (file)
@@ -1,3 +1,15 @@
+2004-11-18 [paul]      0.9.12cvs158.2
+
+       * src/addrgather.c
+       * src/exphtmldlg.c
+       * src/expldifdlg.c
+       * src/mimeview.c
+       * src/prefs_common.c
+       * src/plugins/image_viewer/viewer.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               replace deprecated gtk_notebook_set_page
+               and gtk_notebook_current_page
+
 2004-11-18 [paul]      0.9.12cvs158.1
 
        * configure.ac
index 17314c2..a1c360a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.396.2.12 -r 1.396.2.13 ChangeLog; cvs diff -u -r 1.2504.2.32 -r 1.2504.2.33 ChangeLog.claws; cvs diff -u -r 1.391.2.12 -r 1.391.2.13 ChangeLog.jp; cvs diff -u -r 1.42.2.4 -r 1.42.2.5 NEWS; cvs diff -u -r 1.654.2.278 -r 1.654.2.279 configure.ac; cvs diff -u -r 1.382.2.67 -r 1.382.2.68 src/compose.c; cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/jpilot.c; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 src/privacy.c; cvs diff -u -r 1.49.2.21 -r 1.49.2.22 src/procmime.c; cvs diff -u -r 1.17.2.7 -r 1.17.2.8 src/procmime.h; cvs diff -u -r 1.150.2.15 -r 1.150.2.16 src/procmsg.c; cvs diff -u -r 1.43.2.11 -r 1.43.2.12 src/toolbar.c; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/error.xpm; ) > 0.9.12cvs155.1.patchset
 ( cvs diff -u -r 1.105.2.12 -r 1.105.2.13 src/prefs_account.c; cvs diff -u -r 1.49.2.7 -r 1.49.2.8 src/prefs_account.h; cvs diff -u -r 1.150.2.16 -r 1.150.2.17 src/procmsg.c; ) > 0.9.12cvs156.1.patchset
 ( cvs diff -u -r 1.654.2.280 -r 1.654.2.281 configure.ac; cvs diff -u -r 1.382.2.68 -r 1.382.2.69 src/compose.c; cvs diff -u -r 1.274.2.24 -r 1.274.2.25 src/mainwindow.c; cvs diff -u -r 1.94.2.34 -r 1.94.2.35 src/messageview.c; cvs diff -u -r 1.204.2.22 -r 1.204.2.23 src/prefs_common.c; cvs diff -u -r 1.36.2.15 -r 1.36.2.16 src/common/utils.c; cvs diff -u -r 1.20.2.10 -r 1.20.2.11 src/common/utils.h; ) > 0.9.12cvs158.1.patchset
+( cvs diff -u -r 1.5.10.5 -r 1.5.10.6 src/addrgather.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/exphtmldlg.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/expldifdlg.c; cvs diff -u -r 1.83.2.24 -r 1.83.2.25 src/mimeview.c; cvs diff -u -r 1.204.2.23 -r 1.204.2.24 src/prefs_common.c; cvs diff -u -r 1.7.2.8 -r 1.7.2.9 src/plugins/image_viewer/viewer.c; cvs diff -u -r 1.23.2.6 -r 1.23.2.7 src/plugins/spamassassin/spamassassin_gtk.c; ) > 0.9.12cvs158.2.patchset
index 6b21239..0f4d26a 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=158
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index 39f8a32..a0aaaa4 100644 (file)
@@ -222,7 +222,7 @@ static gboolean addrgather_dlg_harvest() {
        addrgather_dlg_status_show( _("Addresses gathered successfully.") );
 
        /* Display summary page */
-       gtk_notebook_set_page(
+       gtk_notebook_set_current_page(
                GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FINISH );
        gtk_widget_set_sensitive( addrgather_dlg.btnOk, FALSE );
        gtk_widget_grab_default( addrgather_dlg.btnCancel );
@@ -557,7 +557,7 @@ AddressBookFile *addrgather_dlg_execute(
 
        errFlag = TRUE;
        if( folderItem && folderItem->path ) {
-               gtk_notebook_set_page(
+               gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FIELDS );
                addrgather_dlg.folderPath = folder_item_get_path( folderItem );
 
@@ -604,7 +604,7 @@ AddressBookFile *addrgather_dlg_execute(
        gtk_widget_show( addrgather_dlg.window );
 
        if( errFlag ) {
-               gtk_notebook_set_page(
+               gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_WARNING );
                gtk_widget_set_sensitive( addrgather_dlg.btnOk, FALSE );
                gtk_widget_grab_default( addrgather_dlg.btnCancel );
index 07bf85a..6d09646 100644 (file)
@@ -106,7 +106,7 @@ static void export_html_message( void ) {
        gchar *sMsg = NULL;
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
        if( pageNum == PAGE_FILE_INFO ) {
                sMsg = _( "Please specify output directory and file to create." );
        }
@@ -127,7 +127,7 @@ static void export_html_message( void ) {
 static void export_html_cancel( GtkWidget *widget, gpointer data ) {
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
        if( pageNum != PAGE_FINISH ) {
                exphtml_dlg.cancelled = TRUE;
        }
@@ -260,16 +260,16 @@ static void exp_html_finish_show( void ) {
 static void export_html_prev( GtkWidget *widget ) {
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
        if( pageNum == PAGE_FORMAT ) {
                /* Goto file page stuff */
-               gtk_notebook_set_page(
+               gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FILE_INFO );
                gtk_widget_set_sensitive( exphtml_dlg.btnPrev, FALSE );
        }
        else if( pageNum == PAGE_FINISH ) {
                /* Goto format page */
-               gtk_notebook_set_page(
+               gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FORMAT );
                gtk_widget_set_sensitive( exphtml_dlg.btnNext, TRUE );
        }
@@ -283,11 +283,11 @@ static void export_html_prev( GtkWidget *widget ) {
 static void export_html_next( GtkWidget *widget ) {
        gint pageNum;
 
-       pageNum = gtk_notebook_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
+       pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook) );
        if( pageNum == PAGE_FILE_INFO ) {
                /* Goto format page */
                if( exp_html_move_file() ) {
-                       gtk_notebook_set_page(
+                       gtk_notebook_set_current_page(
                                GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FORMAT );
                        gtk_widget_set_sensitive( exphtml_dlg.btnPrev, TRUE );
                }
@@ -296,7 +296,7 @@ static void export_html_next( GtkWidget *widget ) {
        else if( pageNum == PAGE_FORMAT ) {
                /* Goto finish page */
                if( exp_html_move_format() ) {
-                       gtk_notebook_set_page(
+                       gtk_notebook_set_current_page(
                                GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FINISH );
                        exp_html_finish_show();
                        exporthtml_save_settings( _exportCtl_ );
@@ -807,7 +807,7 @@ void addressbook_exp_html( AddressCache *cache ) {
        export_html_fill_fields( _exportCtl_ );
 
        gtk_widget_grab_default(exphtml_dlg.btnNext);
-       gtk_notebook_set_page( GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FILE_INFO );
+       gtk_notebook_set_current_page( GTK_NOTEBOOK(exphtml_dlg.notebook), PAGE_FILE_INFO );
        gtk_widget_set_sensitive( exphtml_dlg.btnPrev, FALSE );
        gtk_widget_set_sensitive( exphtml_dlg.btnNext, TRUE );
 
index 3523d55..282426f 100644 (file)
@@ -287,13 +287,13 @@ static void export_ldif_prev( GtkWidget *widget ) {
        pageNum = gtk_notebook_get_current_page( GTK_NOTEBOOK(expldif_dlg.notebook) );
        if( pageNum == PAGE_DN ) {
                /* Goto file page stuff */
-               gtk_notebook_set_page(
+               gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_FILE_INFO );
                gtk_widget_set_sensitive( expldif_dlg.btnPrev, FALSE );
        }
        else if( pageNum == PAGE_FINISH ) {
                /* Goto format page */
-               gtk_notebook_set_page(
+               gtk_notebook_set_current_page(
                        GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_DN );
                gtk_widget_set_sensitive( expldif_dlg.btnNext, TRUE );
        }
@@ -311,7 +311,7 @@ static void export_ldif_next( GtkWidget *widget ) {
        if( pageNum == PAGE_FILE_INFO ) {
                /* Goto distinguished name page */
                if( exp_ldif_move_file() ) {
-                       gtk_notebook_set_page(
+                       gtk_notebook_set_current_page(
                                GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_DN );
                        gtk_widget_set_sensitive( expldif_dlg.btnPrev, TRUE );
                }
@@ -320,7 +320,7 @@ static void export_ldif_next( GtkWidget *widget ) {
        else if( pageNum == PAGE_DN ) {
                /* Goto finish page */
                if( exp_ldif_move_dn() ) {
-                       gtk_notebook_set_page(
+                       gtk_notebook_set_current_page(
                                GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_FINISH );
                        exp_ldif_finish_show();
                        exportldif_save_settings( _exportCtl_ );
@@ -828,7 +828,7 @@ void addressbook_exp_ldif( AddressCache *cache ) {
        export_ldif_fill_fields( _exportCtl_ );
 
        gtk_widget_grab_default(expldif_dlg.btnNext);
-       gtk_notebook_set_page( GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_FILE_INFO );
+       gtk_notebook_set_current_page( GTK_NOTEBOOK(expldif_dlg.notebook), PAGE_FILE_INFO );
        gtk_widget_set_sensitive( expldif_dlg.btnPrev, FALSE );
        gtk_widget_set_sensitive( expldif_dlg.btnNext, TRUE );
 
index 2632f05..600bed9 100644 (file)
@@ -584,12 +584,12 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
 
        switch (type) {
        case MIMEVIEW_TEXT:
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
                        gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook), 
                        GTK_WIDGET_PTR(textview)));
                break;
        case MIMEVIEW_VIEWER:
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
                        gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook), 
                        GTK_WIDGET(mimeview->mimeviewer->get_widget(mimeview->mimeviewer))));
                break;
index 03267a8..ce12251 100644 (file)
@@ -136,9 +136,9 @@ static void image_viewer_set_notebook_page(MimeViewer *_mimeviewer)
        ImageViewer *imageviewer = (ImageViewer *) _mimeviewer;
 
        if (!imageviewerprefs.display_img)
-               gtk_notebook_set_page(GTK_NOTEBOOK(imageviewer->notebook), 0);
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(imageviewer->notebook), 0);
        else
-               gtk_notebook_set_page(GTK_NOTEBOOK(imageviewer->notebook), 1);
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(imageviewer->notebook), 1);
 }
 
 static void image_viewer_load_image(ImageViewer *imageviewer)
@@ -239,7 +239,7 @@ static void image_viewer_get_resized_size(gint w, gint h, gint aw, gint ah,
 
 static void load_cb(GtkButton *button, ImageViewer *imageviewer)
 {
-       gtk_notebook_set_page(GTK_NOTEBOOK(imageviewer->notebook), 1);
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(imageviewer->notebook), 1);
        image_viewer_load_image(imageviewer);
 }
 
index f7aaab6..227fca4 100644 (file)
@@ -113,7 +113,7 @@ static void show_transport(struct SpamAssassinPage *page, struct Transport *tran
        default:
                break;
        }
-       gtk_notebook_set_page(GTK_NOTEBOOK(page->transport_notebook), transport->page);
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(page->transport_notebook), transport->page);
 }
 
 static void transport_sel_cb(GtkMenuItem *menuitem, gpointer data)
index b877860..97f3003 100644 (file)
@@ -793,7 +793,7 @@ static void create_widget_func(PrefsPage * _page,
        if (notebook == NULL)
                prefs_common_create();
        gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
-       gtk_notebook_set_page(GTK_NOTEBOOK(notebook), 0);
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
 
        prefs_set_dialog(param);