2006-11-26 [paul] 2.6.0cvs63
authorPaul Mangan <paul@claws-mail.org>
Sun, 26 Nov 2006 11:15:44 +0000 (11:15 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sun, 26 Nov 2006 11:15:44 +0000 (11:15 +0000)
* src/expldifdlg.c
* src/folderview.c
* src/image_viewer.c
* src/mainwindow.c
* src/gtk/gtkutils.c
* src/gtk/gtkvscrollbutton.c
* src/gtk/prefswindow.c
* src/plugins/pgpcore/prefs_gpg.c
replace more deprecated GTK+ functions

ChangeLog
PATCHSETS
configure.ac
src/expldifdlg.c
src/folderview.c
src/gtk/gtkutils.c
src/gtk/gtkvscrollbutton.c
src/gtk/prefswindow.c
src/image_viewer.c
src/mainwindow.c
src/plugins/pgpcore/prefs_gpg.c

index 0ce4853708e26947b6642581eba0a69d1421097b..8e0688ad1735298fceb1999efb72f3b9daeddfd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-26 [paul]      2.6.0cvs63
+
+       * src/expldifdlg.c
+       * src/folderview.c
+       * src/image_viewer.c
+       * src/mainwindow.c
+       * src/gtk/gtkutils.c
+       * src/gtk/gtkvscrollbutton.c
+       * src/gtk/prefswindow.c
+       * src/plugins/pgpcore/prefs_gpg.c
+               replace more deprecated GTK+ functions
+
 2006-11-26 [paul]      2.6.0cvs62
 
        * src/addr_compl.c
index d4bf5081a9df5a10b382e77f06a503978241d356..e2ca48fbc3292c2bf76da4d1eeca221c3bfe9d67 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.334 -r 1.382.2.335 src/compose.c;  ) > 2.6.0cvs60.patchset
 ( cvs diff -u -r 1.382.2.335 -r 1.382.2.336 src/compose.c;  cvs diff -u -r 1.207.2.134 -r 1.207.2.135 src/folderview.c;  cvs diff -u -r 1.149.2.62 -r 1.149.2.63 src/inc.c;  cvs diff -u -r 1.395.2.268 -r 1.395.2.269 src/summaryview.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpcore/passphrase.c;  ) > 2.6.0cvs61.patchset
 ( cvs diff -u -r 1.27.2.24 -r 1.27.2.25 src/addr_compl.c;  cvs diff -u -r 1.60.2.69 -r 1.60.2.70 src/addressbook.c;  cvs diff -u -r 1.2.4.13 -r 1.2.4.14 src/browseldap.c;  ) > 2.6.0cvs62.patchset
+( cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/expldifdlg.c;  cvs diff -u -r 1.207.2.135 -r 1.207.2.136 src/folderview.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/image_viewer.c;  cvs diff -u -r 1.274.2.156 -r 1.274.2.157 src/mainwindow.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/gtk/prefswindow.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.6.0cvs63.patchset
index bb1e9efb60e74316e03cb017eda3c45cd4eaf0ca..833b509d45348fd7fe8c3266cb1de83dcc33cc14 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=62
+EXTRA_VERSION=63
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 48cc1b5196eec37c9e9114652721209c05baf946..e4ed03890fb3c43e2ad4f7b1469fe60beb9d36f6 100644 (file)
@@ -229,7 +229,7 @@ static gboolean exp_ldif_move_dn( void ) {
        /* Set RDN format */
        menu = gtk_option_menu_get_menu( GTK_OPTION_MENU( expldif_dlg.optmenuRDN ) );
        menuItem = gtk_menu_get_active( GTK_MENU( menu ) );
-       id = GPOINTER_TO_INT( gtk_object_get_user_data(GTK_OBJECT(menuItem)) );
+       id = GPOINTER_TO_INT( g_object_get_data(G_OBJECT(menuItem), "user_data"));
        exportldif_set_rdn( _exportCtl_, id );
 
        exportldif_set_suffix( _exportCtl_, suffix );
@@ -493,7 +493,7 @@ static void export_ldif_page_dn( gint pageNum, gchar *pageLbl ) {
        menu = gtk_menu_new();
 
        menuItem = gtk_menu_item_new_with_label( _( "Unique ID" ) );
-       gtk_object_set_user_data( GTK_OBJECT( menuItem ),
+       g_object_set_data( G_OBJECT( menuItem ), "user_data",
                        GINT_TO_POINTER( EXPORT_LDIF_ID_UID ) );
        gtk_menu_append( GTK_MENU(menu), menuItem );
        gtk_widget_show( menuItem );
@@ -506,7 +506,7 @@ static void export_ldif_page_dn( gint pageNum, gchar *pageLbl ) {
                ), NULL );
 
        menuItem = gtk_menu_item_new_with_label( _( "Display Name" ) );
-       gtk_object_set_user_data( GTK_OBJECT( menuItem ),
+       g_object_set_data( G_OBJECT( menuItem ), "user_data",
                        GINT_TO_POINTER( EXPORT_LDIF_ID_DNAME ) );
        gtk_menu_append( GTK_MENU(menu), menuItem );
        gtk_widget_show( menuItem );
@@ -519,7 +519,7 @@ static void export_ldif_page_dn( gint pageNum, gchar *pageLbl ) {
                ), NULL );
 
        menuItem = gtk_menu_item_new_with_label( _( "Email Address" ) );
-       gtk_object_set_user_data( GTK_OBJECT( menuItem ),
+       g_object_set_data( G_OBJECT( menuItem ), "user_data",
                        GINT_TO_POINTER( EXPORT_LDIF_ID_EMAIL ) );
        gtk_menu_append( GTK_MENU(menu), menuItem );
        gtk_widget_show( menuItem );
index 1bfcbc6810c1f289981dfa5e3a250a4ea73f52d5..52e2453ef5957e5d4c7a379182fd6c2f37bd6e07 100644 (file)
@@ -394,9 +394,9 @@ static void folderview_column_set_titles(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
                         &readxpm, &readxpmmask);
                
-       label_new = gtk_pixmap_new(newxpm, newxpmmask);
-       label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
-       label_total = gtk_pixmap_new(readxpm, readxpmmask);
+       label_new = gtk_image_new_from_pixmap(newxpm, newxpmmask);
+       label_unread = gtk_image_new_from_pixmap(unreadxpm, unreadxpmmask);
+       label_total = gtk_image_new_from_pixmap(readxpm, readxpmmask);
        
        gtk_clist_column_titles_active(GTK_CLIST(ctree));
         
index 1ddd84ea5eadfe5a95a9dbb3f4143d3bfcb47e33..a7d58b305d9692c4a20eef3fe312fc8620c5972a 100644 (file)
@@ -772,19 +772,19 @@ void gtkut_widget_init(void)
 
        clist = gtk_clist_new(1);
        g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+       g_object_ref_sink(G_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
        g_object_unref(G_OBJECT(clist));
 
        clist = gtk_ctree_new(1, 0);
        g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+       g_object_ref_sink(G_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
        g_object_unref(G_OBJECT(clist));
 
        clist = gtk_sctree_new_with_titles(1, 0, NULL);
        g_object_ref(G_OBJECT(clist));
-       gtk_object_sink(GTK_OBJECT(clist));
+       g_object_ref_sink(G_OBJECT(clist));
        gtkut_clist_bindings_add(clist);
        g_object_unref(G_OBJECT(clist));
 }
index c6ad14c0538496b7a5a75df62d21b6c81928ea0f..5ba1b41eaa7cbbc21ef1d37cb6939e1f5a07340d 100644 (file)
@@ -198,7 +198,7 @@ void gtk_vscrollbutton_set_adjustment(GtkVScrollbutton *scrollbutton,
 
        scrollbutton->adjustment = adjustment;
        g_object_ref(G_OBJECT(adjustment));
-       gtk_object_sink(GTK_OBJECT(adjustment));
+       g_object_ref_sink(G_OBJECT(adjustment));
     }
 }
 
index 835d8cfb177a4ff32b6c5d1e4fdf0189455eb279..8e2fac46558eaf1182ca7dc456d16e4aa390448a 100644 (file)
@@ -560,7 +560,8 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
                gtk_label_set_text(GTK_LABEL(prefswindow->pagelabel), "");
                pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
                                                prefswindow->empty_page);
-               gtk_notebook_set_page(GTK_NOTEBOOK(prefswindow->notebook), pagenum);
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook),
+                                             pagenum);
                return TRUE;
        }
 
@@ -579,7 +580,8 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
 
        pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
                                        page->widget);
-       gtk_notebook_set_page(GTK_NOTEBOOK(prefswindow->notebook), pagenum);
+       gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook),
+                                     pagenum);
 
        adj = gtk_scrolled_window_get_vadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
index 3d3d71f4f5a4c34b605a94072e17131b5342f4db..4227d8bfa367427d3d33d766ff70656134067aeb 100644 (file)
@@ -103,13 +103,14 @@ static void image_viewer_load_file(ImageViewer *imageviewer, const gchar *imgfil
        gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 0);
 
        if (!imageviewer->image) {
-               imageviewer->image = gtk_pixmap_new(pixmap, mask);
+               imageviewer->image = gtk_image_new_from_pixmap(pixmap, mask);
 
                gtk_scrolled_window_add_with_viewport
                        (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin),
                         imageviewer->image);
        } else
-               gtk_pixmap_set(GTK_PIXMAP(imageviewer->image), pixmap, mask);
+               gtk_image_set_from_pixmap(GTK_PIXMAP(imageviewer->image),
+                                         pixmap, mask);
 
        gtk_widget_show(imageviewer->image);
 
@@ -173,7 +174,8 @@ static void image_viewer_clear_viewer(MimeViewer *_mimeviewer)
        image_viewer_set_notebook_page(_mimeviewer);
 
        if (imageviewer->image != NULL)
-               gtk_pixmap_set(GTK_PIXMAP(imageviewer->image), NULL, NULL);
+               gtk_image_set_from_pixmap(GTK_PIXMAP(imageviewer->image),
+                                         NULL, NULL);
 
        if (imageviewer->scrolledwin) {
                hadj = gtk_scrolled_window_get_hadjustment
index e7057e7df3d5421b092a6ada2e37eb882f16caf4..4bf547637bd688372285d634f18137d0d5e21df8 100644 (file)
@@ -2487,15 +2487,17 @@ static gint mailing_list_populate_submenu (GtkWidget *menuitem, const gchar * li
                        item = NULL;
                        if (!g_strncasecmp(url_decoded, "mailto:", 7)) {
                                item = gtk_menu_item_new_with_label ((url_decoded));
-                               gtk_signal_connect (GTK_OBJECT(item), "activate",
-                                               GTK_SIGNAL_FUNC(mailing_list_compose), NULL);
+                               g_signal_connect(G_OBJECT(item), "activate",
+                                                G_CALLBACK(mailing_list_compose),
+                                                NULL);
                        }
                        else if (!g_strncasecmp (url_decoded, "http:", 5) ||
                                 !g_strncasecmp (url_decoded, "https:",6)) {
 
                                item = gtk_menu_item_new_with_label ((url_decoded));
-                               gtk_signal_connect (GTK_OBJECT(item), "activate",
-                                               GTK_SIGNAL_FUNC(mailing_list_open_uri), NULL);
+                               g_signal_connect(G_OBJECT(item), "activate",
+                                                G_CALLBACK(mailing_list_open_uri),
+                                                NULL);
                        } 
                        if (item) {
                                gtk_menu_append (GTK_MENU(menu), item);
index bd08e5d665aa245a39a910dd484e9069fcf78e44..3b63067958f0d7fae736464f521f5433c65154df 100644 (file)
@@ -284,7 +284,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 
        key_default = gtk_radio_button_new_with_label(key_group,
                        _("Use default GnuPG key"));
-       key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_default));
+       key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_default));
        gtk_widget_show(key_default);
        gtk_box_pack_start(GTK_BOX(hbox), key_default, FALSE, FALSE, 0);
 
@@ -295,7 +295,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 
        key_by_from = gtk_radio_button_new_with_label(key_group,
                _("Select key by your email address"));
-       key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_by_from));
+       key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_by_from));
        gtk_widget_show(key_by_from);
        gtk_box_pack_start(GTK_BOX(hbox), key_by_from, FALSE, FALSE, 0);
 
@@ -306,7 +306,7 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page,
 
        key_custom = gtk_radio_button_new_with_label(key_group,
                _("Specify key manually"));
-       key_group = gtk_radio_button_group(GTK_RADIO_BUTTON(key_custom));
+       key_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(key_custom));
        gtk_widget_show(key_custom);
        gtk_box_pack_start(GTK_BOX(hbox), key_custom, FALSE, FALSE, 0);