gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2006-11-26 [paul] 2.6.0cvs61

Browse source 
* src/compose.c
	* src/folderview.c
	* src/inc.c
	* src/summaryview.c
	* src/gtk/gtkvscrollbutton.c
	* src/gtk/quicksearch.c
	* src/plugins/pgpcore/passphrase.c
		replace deprecated gtk_timeout_add and
		gtk_timeout_remove
This commit is contained in:
Paul Mangan 2006-11-26 09:43:34 +00:00
parent 9f23c56bcd
commit 2d948614e8
10 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2006-11-26 [paul] 2.6.0cvs61
* src/compose.c
* src/folderview.c
* src/inc.c
* src/summaryview.c
* src/gtk/gtkvscrollbutton.c
* src/gtk/quicksearch.c
* src/plugins/pgpcore/passphrase.c
replace deprecated gtk_timeout_add and
gtk_timeout_remove
2006-11-26 [paul] 2.6.0cvs60
* src/compose.c

1
PATCHSETS
View file

@ -2085,3 +2085,4 @@
( cvs diff -u -r 1.382.2.333 -r 1.382.2.334 src/compose.c; ) > 2.6.0cvs58.patchset
( 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

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=60
EXTRA_VERSION=61
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

4
src/compose.c
View file

@ -7865,7 +7865,7 @@ static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
return;
if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
gtk_timeout_remove(compose->draft_timeout_tag);
g_source_remove(compose->draft_timeout_tag);
compose->draft_timeout_tag = -1;
}
@ -9140,7 +9140,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
if (prefs_common.autosave &&
gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0)
compose->draft_timeout_tag = gtk_timeout_add
compose->draft_timeout_tag = g_timeout_add
(500, (GtkFunction) compose_defer_auto_save_draft, compose);
}
static gint compose_defer_auto_save_draft(Compose *compose)

4
src/folderview.c
View file

@ -2604,7 +2604,7 @@ void folderview_reflect_prefs(void)
static void drag_state_stop(FolderView *folderview)
{
if (folderview->drag_timer)
gtk_timeout_remove(folderview->drag_timer);
g_source_remove(folderview->drag_timer);
folderview->drag_timer = 0;
folderview->drag_node = NULL;
}
@ -2631,7 +2631,7 @@ static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderI
* we need to call drag_state_stop() */
drag_state_stop(folderview);
/* request expansion */
if (0 != (folderview->drag_timer = gtk_timeout_add
if (0 != (folderview->drag_timer = g_timeout_add
(prefs_common.hover_timeout,
(GtkFunction)folderview_defer_expand,
folderview))) {

25
src/gtk/gtkvscrollbutton.c
View file

@ -34,6 +34,7 @@
# include "config.h"
#endif
#include <glib.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkmisc.h>
@ -305,10 +306,10 @@ gtk_vscrollbutton_timer_1st_time(GtkVScrollbutton *scrollbutton)
* above, we might have been removed, and another added.
*/
g_source_remove(scrollbutton->timer);
scrollbutton->timer = gtk_timeout_add(SCROLL_LATER_DELAY,
(GtkFunction)
gtk_real_vscrollbutton_timer,
scrollbutton);
scrollbutton->timer = g_timeout_add(SCROLL_LATER_DELAY,
(GtkFunction)
gtk_real_vscrollbutton_timer,
scrollbutton);
}
g_object_unref(G_OBJECT(scrollbutton));
return FALSE; /* don't keep calling this function */
@ -322,10 +323,10 @@ static void gtk_vscrollbutton_add_timer(GtkVScrollbutton *scrollbutton)
if (!scrollbutton->timer) {
scrollbutton->need_timer = TRUE;
scrollbutton->timer = gtk_timeout_add(SCROLL_INITIAL_DELAY,
(GtkFunction)
gtk_vscrollbutton_timer_1st_time,
scrollbutton);
scrollbutton->timer = g_timeout_add(SCROLL_INITIAL_DELAY,
(GtkFunction)
gtk_vscrollbutton_timer_1st_time,
scrollbutton);
}
}
@ -335,7 +336,7 @@ static void gtk_vscrollbutton_remove_timer(GtkVScrollbutton *scrollbutton)
g_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
if (scrollbutton->timer) {
gtk_timeout_remove(scrollbutton->timer);
g_source_remove(scrollbutton->timer);
scrollbutton->timer = 0;
}
scrollbutton->need_timer = FALSE;
@ -352,9 +353,9 @@ static gint gtk_real_vscrollbutton_timer(GtkVScrollbutton *scrollbutton)
return_val = FALSE;
if (scrollbutton->need_timer)
scrollbutton->timer =
gtk_timeout_add(SCROLL_TIMER_LENGTH,
(GtkFunction) gtk_real_vscrollbutton_timer,
(gpointer) scrollbutton);
g_timeout_add(SCROLL_TIMER_LENGTH,
(GtkFunction) gtk_real_vscrollbutton_timer,
(gpointer) scrollbutton);
else {
GDK_THREADS_LEAVE();
return FALSE;

4
src/gtk/quicksearch.c
View file

@ -197,9 +197,9 @@ static gboolean searchbar_changed_cb(GtkWidget *widget, QuickSearch *qs)
{
if (prefs_common.summary_quicksearch_dynamic) {
if (qs->press_timeout_id != -1) {
gtk_timeout_remove(qs->press_timeout_id);
g_source_remove(qs->press_timeout_id);
}
qs->press_timeout_id = gtk_timeout_add(500,
qs->press_timeout_id = g_timeout_add(500,
searchbar_changed_timeout, qs);
}

4
src/inc.c
View file

@ -1403,7 +1403,7 @@ static void inc_autocheck_timer_set_interval(guint interval)
the common preferences */
if (prefs_common.autochk_newmail && autocheck_data
&& prefs_common.work_offline == FALSE) {
autocheck_timer = gtk_timeout_add
autocheck_timer = g_timeout_add
(interval, inc_autocheck_func, autocheck_data);
debug_print("added timer = %d\n", autocheck_timer);
}
@ -1418,7 +1418,7 @@ void inc_autocheck_timer_remove(void)
{
if (autocheck_timer) {
debug_print("removed timer = %d\n", autocheck_timer);
gtk_timeout_remove(autocheck_timer);
g_source_remove(autocheck_timer);
autocheck_timer = 0;
}
}

6
src/plugins/pgpcore/passphrase.c
View file

@ -337,9 +337,9 @@ gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
debug_print("%% locking passphrase failed\n");
#endif
if (prefs_gpg_get_config()->store_passphrase_timeout > 0) {
gtk_timeout_add(prefs_gpg_get_config()
->store_passphrase_timeout*60*1000,
free_passphrase, NULL);
g_timeout_add(prefs_gpg_get_config()
->store_passphrase_timeout*60*1000,
free_passphrase, NULL);
}
}
debug_print ("%% sending passphrase\n");

5
src/summaryview.c
View file

@ -3007,7 +3007,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
data->summaryview = summaryview;
data->msginfo = msginfo;
data->row = row;
gtk_timeout_add(prefs_common.mark_as_read_delay * 1000,
g_timeout_add(prefs_common.mark_as_read_delay * 1000,
msginfo_mark_as_read_timeout, data);
} else if (new_window || !prefs_common.mark_as_read_on_new_window) {
msginfo_mark_as_read(summaryview, msginfo, row);
@ -3397,8 +3397,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
msginfo->msgnum);
}
void summary_mark_as_read
(SummaryView *summaryview)
void summary_mark_as_read(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;