+2011-04-10 [colin] 3.7.9cvs3
+
+ * src/addr_compl.c
+ * src/addressbook.c
+ * src/browseldap.c
+ * src/compose.c
+ * src/folder.c
+ * src/folderview.c
+ * src/gtk/gtkvscrollbutton.c
+ * src/gtk/gtkvscrollbutton.h
+ s/GtkFunction/GSourceFunc
+
2011-04-10 [colin] 3.7.9cvs2
* src/mainwindow.c
( cvs diff -u -r 1.9.2.20 -r 1.9.2.21 po/cs.po; cvs diff -u -r 1.60.2.62 -r 1.60.2.63 po/es.po; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 po/fi.po; cvs diff -u -r 1.42.2.53 -r 1.42.2.54 po/fr.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/lt.po; cvs diff -u -r 1.50.2.40 -r 1.50.2.41 po/pt_BR.po; cvs diff -u -r 1.2.2.31 -r 1.2.2.32 po/sk.po; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/uk.po; ) > 3.7.8cvs78.patchset
( cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/prefs_summaries.c; ) > 3.7.9cvs1.patchset
( cvs diff -u -r 1.274.2.321 -r 1.274.2.322 src/mainwindow.c; ) > 3.7.9cvs2.patchset
+( cvs diff -u -r 1.27.2.50 -r 1.27.2.51 src/addr_compl.c; cvs diff -u -r 1.60.2.140 -r 1.60.2.141 src/addressbook.c; cvs diff -u -r 1.2.4.25 -r 1.2.4.26 src/browseldap.c; cvs diff -u -r 1.382.2.570 -r 1.382.2.571 src/compose.c; cvs diff -u -r 1.213.2.201 -r 1.213.2.202 src/folder.c; cvs diff -u -r 1.207.2.219 -r 1.207.2.220 src/folderview.c; cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/gtk/gtkvscrollbutton.h; ) > 3.7.9cvs3.patchset
MICRO_VERSION=9
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
/* Sit back and wait until something happens */
_completionIdleID_ =
- g_idle_add( ( GtkFunction ) addrcompl_idle, NULL );
+ g_idle_add( (GSourceFunc) addrcompl_idle, NULL );
/* g_print( "addrindex_start_search::queryID=%d\n", _queryID_ ); */
addrindex_start_search( _queryID_ );
/* Set up idler function */
idleID = g_idle_add(
- ( GtkFunction ) addressbook_search_idle,
+ (GSourceFunc) addressbook_search_idle,
GINT_TO_POINTER( queryID ) );
/* Start search, sit back and wait for something to happen */
_queryID_ = ldaplocate_search_setup(
server, dn, browse_callback_entry, browse_callback_end );
debug_print("query id: %d\n", _queryID_);
- _browseIdleID_ = g_idle_add( ( GtkFunction ) browse_idle, NULL );
+ _browseIdleID_ = g_idle_add( (GSourceFunc) browse_idle, NULL );
/* Start search */
debug_print("starting search\n");
static void compose_check_forwards_go (GtkAction *action, gpointer data);
#endif
-static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
static MsgInfo *compose_msginfo_new_from_compose(Compose *compose);
}
}
+static gboolean compose_defer_auto_save_draft(Compose *compose)
+{
+ compose->draft_timeout_tag = -1;
+ compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
+ return FALSE;
+}
+
static void compose_show_first_last_header(Compose *compose, gboolean show_first)
{
GtkAdjustment *vadj;
gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0 &&
compose->draft_timeout_tag != -2 /* disabled while loading */)
compose->draft_timeout_tag = g_timeout_add
- (500, (GtkFunction) compose_defer_auto_save_draft, compose);
-}
-static gint compose_defer_auto_save_draft(Compose *compose)
-{
- compose->draft_timeout_tag = -1;
- compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
- return FALSE;
+ (500, (GSourceFunc) compose_defer_auto_save_draft, compose);
}
#if USE_ENCHANT
Folder *folder_find_from_identifier(const gchar *identifier)
{
- Folder *folder;
- gpointer d[2];
gchar *str;
gchar *p;
gchar *name;
- gchar *path;
FolderClass *class;
cm_return_val_if_fail(identifier != NULL, NULL);
folderview->drag_node = NULL;
}
-static gint folderview_defer_expand(FolderView *folderview)
+static gboolean folderview_defer_expand(FolderView *folderview)
{
if (folderview->drag_node) {
folderview_recollapse_nodes(folderview, folderview->drag_node);
/* request expansion */
if (0 != (folderview->drag_timer = g_timeout_add
(prefs_common.hover_timeout,
- (GtkFunction)folderview_defer_expand,
+ (GSourceFunc)folderview_defer_expand,
folderview))) {
folderview->drag_node = node;
folderview->drag_item = item;
static void gtk_vscrollbutton_remove_timer (GtkVScrollbutton *scrollbutton);
-static gint gtk_real_vscrollbutton_timer (GtkVScrollbutton *scrollbutton);
+static gboolean gtk_real_vscrollbutton_timer (GtkVScrollbutton *scrollbutton);
static void gtk_vscrollbutton_set_sensitivity (GtkAdjustment *adjustment,
GtkVScrollbutton *scrollbutton);
return TRUE;
}
-gint gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
+gboolean gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
{
gfloat new_value;
- gint return_val;
+ gboolean return_val;
cm_return_val_if_fail(scrollbutton != NULL, FALSE);
cm_return_val_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton), FALSE);
*/
g_source_remove(scrollbutton->timer);
scrollbutton->timer = g_timeout_add(SCROLL_LATER_DELAY,
- (GtkFunction)
+ (GSourceFunc)
gtk_real_vscrollbutton_timer,
scrollbutton);
}
if (!scrollbutton->timer) {
scrollbutton->need_timer = TRUE;
scrollbutton->timer = g_timeout_add(SCROLL_INITIAL_DELAY,
- (GtkFunction)
+ (GSourceFunc)
gtk_vscrollbutton_timer_1st_time,
scrollbutton);
}
scrollbutton->need_timer = FALSE;
}
-static gint gtk_real_vscrollbutton_timer(GtkVScrollbutton *scrollbutton)
+static gboolean gtk_real_vscrollbutton_timer(GtkVScrollbutton *scrollbutton)
{
- gint return_val;
+ gboolean return_val;
GDK_THREADS_ENTER();
if (scrollbutton->need_timer)
scrollbutton->timer =
g_timeout_add(SCROLL_TIMER_LENGTH,
- (GtkFunction) gtk_real_vscrollbutton_timer,
+ (GSourceFunc) gtk_real_vscrollbutton_timer,
(gpointer) scrollbutton);
else {
GDK_THREADS_LEAVE();
GType gtk_vscrollbutton_get_type (void);
GtkWidget* gtk_vscrollbutton_new (GtkAdjustment *adjustment);
-gint gtk_vscrollbutton_scroll (GtkVScrollbutton *scrollbutton);
+gboolean gtk_vscrollbutton_scroll (GtkVScrollbutton *scrollbutton);
#ifdef __cplusplus
}