+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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;
}
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)
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;
}
* 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))) {
# include "config.h"
#endif
+#include <glib.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkmisc.h>
* 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 */
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);
}
}
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;
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;
{
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);
}
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);
}
{
if (autocheck_timer) {
debug_print("removed timer = %d\n", autocheck_timer);
- gtk_timeout_remove(autocheck_timer);
+ g_source_remove(autocheck_timer);
autocheck_timer = 0;
}
}
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");
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);
msginfo->msgnum);
}
-void summary_mark_as_read
-(SummaryView *summaryview)
+void summary_mark_as_read(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GList *cur;