2006-11-26 [paul] 2.6.0cvs62

	* src/addr_compl.c
	* src/addressbook.c
	* src/browseldap.c
		replace deprecated gtk_idle_... functions

diff --git a/ChangeLog b/ChangeLog
index d35173982ce30cbe603510a2cc620d3e0fd9f2d2..0ce4853708e26947b6642581eba0a69d1421097b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-26 [paul]      2.6.0cvs62
+
+       * src/addr_compl.c
+       * src/addressbook.c
+       * src/browseldap.c
+               replace deprecated gtk_idle_... functions
+
 2006-11-26 [paul]      2.6.0cvs61
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 7fdf01ee38bf9493cf102a6e080260ba7133dd23..d4bf5081a9df5a10b382e77f06a503978241d356 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2086,3 +2086,4 @@
 ( cvs diff -u -r 1.395.2.267 -r 1.395.2.268 src/summaryview.c;  ) > 2.6.0cvs59.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index 2315f05c223ccc36498745d08c461ad7d588518a..bb1e9efb60e74316e03cb017eda3c45cd4eaf0ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addr_compl.c b/src/addr_compl.c
index c870bd8f8f5ca2e630e7dd0d1feedafb55dd4bc7..e4613285a86df72d21622747fc72d7c6486dd40c 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -718,7 +718,7 @@ static void addrcompl_destroy_window( CompletionWindow *cw ) {
 
        /* Remove idler function... or application may not terminate */
        if( _completionIdleID_ != 0 ) {
-               gtk_idle_remove( _completionIdleID_ );
+               g_source_remove( _completionIdleID_ );
                _completionIdleID_ = 0;
        }
 
@@ -1008,7 +1008,7 @@ static void addrcompl_start_search( void ) {
 
        /* Sit back and wait until something happens */
        _completionIdleID_ =
-               gtk_idle_add( ( GtkFunction ) addrcompl_idle, NULL );
+               g_idle_add( ( GtkFunction ) addrcompl_idle, NULL );
        /* printf( "addrindex_start_search::queryID=%d\n", _queryID_ ); */
 
        addrindex_start_search( _queryID_ );
@@ -1042,7 +1042,7 @@ static void completion_window_apply_selection(GtkTreeView *list_view,
 
        /* First remove the idler */
        if( _completionIdleID_ != 0 ) {
-               gtk_idle_remove( _completionIdleID_ );
+               g_source_remove( _completionIdleID_ );
                _completionIdleID_ = 0;
        }
 

diff --git a/src/addressbook.c b/src/addressbook.c
index 75d994a1a2840e70883566dd9115dd9d9f87f7e4..d44806e4a6a27bb30c785cd841bf739c9c746cf2 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3914,7 +3914,7 @@ void addressbook_clear_idler( gint queryID ) {
        /* printf( "addressbook_clear_idler::%d::\n", queryID ); */
        ptrQID = GINT_TO_POINTER( queryID );
        if( ptrQID ) {
-               gtk_idle_remove_by_data( ptrQID );
+               g_idle_remove_by_data( ptrQID );
        }
 }
 
@@ -3937,7 +3937,7 @@ static void addressbook_search_callback_end(
        /* Remove idler function */
        ptrQID = GINT_TO_POINTER( queryID );
        if( ptrQID ) {
-               gtk_idle_remove_by_data( ptrQID );
+               g_idle_remove_by_data( ptrQID );
        }
 
        /* Refresh addressbook contents */
@@ -4016,7 +4016,7 @@ static void addressbook_perform_search(
        if( queryID == 0 ) return;
 
        /* Set up idler function */
-       idleID = gtk_idle_add(
+       idleID = g_idle_add(
                        ( GtkFunction ) addressbook_search_idle,
                        GINT_TO_POINTER( queryID ) );
 

diff --git a/src/browseldap.c b/src/browseldap.c
index 750bc31ddb5390312862d0df7197c4babc016f34..09170cc3da310faacb6908e4c1146eb10d7f8517 100644 (file)
--- a/src/browseldap.c
+++ b/src/browseldap.c
@@ -338,7 +338,7 @@ static gboolean browse_idle( gpointer data ) {
        if( _searchComplete_ ) {
                /* Remove idler */
                if( _browseIdleID_ != 0 ) {
-                       gtk_idle_remove( _browseIdleID_ );
+                       g_source_remove( _browseIdleID_ );
                        _browseIdleID_ = 0;
                        gtk_clist_select_row(
                                GTK_CLIST( browseldap_dlg.list_entry ), 0, 0 );
@@ -383,7 +383,7 @@ gboolean browseldap_entry( AddressDataSource *ds, const gchar *dn ) {
        _searchComplete_ = FALSE;
        _queryID_ = ldaplocate_search_setup(
                        server, dn, browse_callback_entry, browse_callback_end );
-       _browseIdleID_ = gtk_idle_add( ( GtkFunction ) browse_idle, NULL );
+       _browseIdleID_ = g_idle_add( ( GtkFunction ) browse_idle, NULL );
 
        /* Start search */
        ldaplocate_search_start( _queryID_ );
@@ -396,7 +396,7 @@ gboolean browseldap_entry( AddressDataSource *ds, const gchar *dn ) {
        ldaplocate_search_stop( _queryID_ );
 
        if( _browseIdleID_ != 0 ) {
-               gtk_idle_remove( _browseIdleID_ );
+               g_source_remove( _browseIdleID_ );
                _browseIdleID_ = 0;
        }
        browse_clear_queue();