+2005-09-16 [colin] 1.9.14cvs34
+
+ * configure.ac
+ * src/Makefile.am
+ * src/addr_compl.c
+ * src/addrindex.c
+ * src/browseldap.c
+ * src/editldap.c
+ * src/ldaplocate.c
+ * src/ldapquery.c
+ * src/ldapquery.h
+ * src/ldapserver.c
+ * src/ldapserver.h
+ * src/main.c
+ * src/matcher_parser_parse.y
+ * src/prefs_themes.c
+ * src/etpan/Makefile.am
+ * src/gtk/description_window.c
+ * src/plugins/clamav/Makefile.am
+ * src/plugins/clamav/clamav_plugin.c
+ * src/plugins/dillo_viewer/Makefile.am
+ * src/plugins/pgpcore/Makefile.am
+ * src/plugins/pgpinline/Makefile.am
+ * src/plugins/pgpmime/Makefile.am
+ * src/plugins/trayicon/Makefile.am
+ Fix 100% cpu usage in address completion list
+ Fix little bugs (return with no values etc)
+ Fix all warnings (with common CFLAGS)
+
2005-09-15 [colin] 1.9.14cvs33
* src/addressbook.c
( cvs diff -u -r 1.60.2.21 -r 1.60.2.22 src/prefs_actions.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_quote.c; cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/quote_fmt.c; cvs diff -u -r 1.395.2.123 -r 1.395.2.124 src/summaryview.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/description_window.c; cvs diff -u -r 1.1 -r 1.2 src/gtk/description_window.h; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/quicksearch.c; ) > 1.9.14cvs31.patchset
( cvs diff -u -r 1.43.2.22 -r 1.43.2.23 src/prefs_matcher.c; ) > 1.9.14cvs32.patchset
( cvs diff -u -r 1.60.2.29 -r 1.60.2.30 src/addressbook.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/ldapquery.c; ) > 1.9.14cvs33.patchset
+( cvs diff -u -r 1.654.2.844 -r 1.654.2.845 configure.ac; cvs diff -u -r 1.155.2.31 -r 1.155.2.32 src/Makefile.am; cvs diff -u -r 1.27.2.12 -r 1.27.2.13 src/addr_compl.c; cvs diff -u -r 1.28.2.8 -r 1.28.2.9 src/addrindex.c; cvs diff -u -r 1.2.4.7 -r 1.2.4.8 src/browseldap.c; cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/editldap.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/ldaplocate.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/ldapquery.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/ldapquery.h; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 src/ldapserver.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/ldapserver.h; cvs diff -u -r 1.115.2.53 -r 1.115.2.54 src/main.c; cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/matcher_parser_parse.y; cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_themes.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/etpan/Makefile.am; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/gtk/description_window.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/clamav/Makefile.am; cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/dillo_viewer/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpinline/Makefile.am; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/trayicon/Makefile.am; ) > 1.9.14cvs34.patchset
MICRO_VERSION=14
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
if test "x$libetpan_result" = "xyes"; then
AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
LDFLAGS="$LDFLAGS `$libetpanconfig --libs 2>/dev/null`"
- AC_TRY_LINK([], [db_mailstorage_init();], [libetpan_result=yes], [libetpan_result=no])
+ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
AC_MSG_RESULT([$libetpan_result])
fi
fi
$(OPENSSL_CFLAGS) \
$(GNOMEPRINT_CFLAGS) \
$(LIBETPAN_CPPFLAGS) \
- $(STARTUP_NOTIFICATION_CFLAGS)
+ $(STARTUP_NOTIFICATION_CFLAGS) \
+ -Wno-unused-function
+
+#no-unused-function is there because of bison stuff
+#no-deprecated-declarations because of gpgme_data_rewind, which we have
+#to call inside gpgme due to our lack of LARGEFILE support
+
AM_YFLAGS = -d
#include "addr_compl.h"
#include "utils.h"
#include "prefs_common.h"
+#include "sylpheed.h"
#include <pthread.h>
/*!
_displayQueue_ = NULL;
}
pthread_mutex_unlock( & _completionMutex_ );
+ sylpheed_do_idle();
return TRUE;
}
#include "ldapserver.h"
#include "ldapctrl.h"
#include "ldapquery.h"
+#include "ldaputil.h"
#endif
#define TAG_ADDRESS_INDEX "addressbook"
}
+void ldapsvr_set_control( LdapServer *server, LdapControl *ctl );
/**
* Parse LDAP control data from XML file.
* \param file Index file.
#endif
+void ldapsvr_execute_query( LdapServer *server, LdapQuery *qry );
/**
* Execute the previously registered dynamic search.
*
LdapQuery *qry, gint queryID, gint status, gpointer data )
{
_searchComplete_ = TRUE;
+ return 0;
}
/**
static gboolean edit_ldap_validate( void ) {
gchar *str;
gboolean errorFlag;
- gint page;
+ gint page = 0;
errorFlag = FALSE;
str = gtk_editable_get_chars(
-I../common \
-I.. \
$(GTK_CFLAGS) \
- $(LIBETPAN_CFLAGS)
+ $(LIBETPAN_CFLAGS)
libsylpheedetpan_la_LIBADD = \
../common/libsylpheedcommon.la \
GdkEventFocus *event,
gpointer data)
{
- if (gtk_grab_get_current != widget)
- gtk_grab_add(GTK_WINDOW(widget));
+ if (gtk_grab_get_current() != widget)
+ gtk_grab_add(GTK_WIDGET(widget));
return FALSE;
}
GdkEventFocus *event,
gpointer data)
{
- gtk_grab_remove(GTK_WINDOW(widget));
+ gtk_grab_remove(GTK_WIDGET(widget));
return FALSE;
}
#include "ldapserver.h"
#include "ldapquery.h"
+void ldapsvr_add_query( LdapServer *server, LdapQuery *qry );
+void ldapsvr_execute_query( LdapServer *server, LdapQuery *qry );
/**
* Setup the search that will be performed and registered with the query
* manager.
QueryRequest *req;
AddrQueryObject *aqo;
LdapQuery *qry;
- gint queryType;
req = qrymgr_find_request( queryID );
if( req == NULL ) {
*/
gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
gboolean value;
- g_return_if_fail( qry != NULL );
+ g_return_val_if_fail( qry != NULL, TRUE );
pthread_mutex_lock( qry->mutexStop );
value = qry->stopFlag;
*/
gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
gboolean value;
- g_return_if_fail( qry != NULL );
+ g_return_val_if_fail( qry != NULL, FALSE );
pthread_mutex_lock( qry->mutexBusy );
value = qry->busyFlag;
* \return <i>TRUE</i> if query has been marked as aged (and can be retired).
*/
gboolean ldapqry_get_aged_flag( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+ g_return_val_if_fail( qry != NULL, TRUE );
return qry->agedFlag;
}
* \return Data.
*/
gpointer ldapqry_get_data( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+ g_return_val_if_fail( qry != NULL, NULL );
return qry->data;
}
static gint ldapqry_search_retrieve( LdapQuery *qry ) {
LdapControl *ctl;
LDAP *ld;
- LDAPMessage *result, *e;
+ LDAPMessage *result, *e = NULL;
char **attribs;
gchar *criteria;
gboolean searchFlag;
return ADDRQUERY_RETVAL(qry);
}
+static gint ldapqry_perform_locate( LdapQuery *qry );
+
/**
* Wrapper around search.
* \param qry Query object to process.
static gint ldapqry_locate_retrieve( LdapQuery *qry ) {
LdapControl *ctl;
LDAP *ld;
- LDAPMessage *result, *e;
+ LDAPMessage *result, *e = NULL;
gboolean entriesFound;
gboolean first;
struct timeval timeout;
* \param qry Query object to process.
* \return Error/status code.
*/
-gint ldapqry_perform_locate( LdapQuery *qry ) {
+static gint ldapqry_perform_locate( LdapQuery *qry ) {
/* Connect */
qry->ldap = NULL;
ldapqry_connect( qry );
void ldapqry_age ( LdapQuery *qry, gint maxAge );
void ldapqry_delete_folder ( LdapQuery *qry );
gboolean ldapquery_remove_results( LdapQuery *qry );
-
+void ldapqry_free_list_name_value( GList *list );
+void ldapqry_free_name_value( NameValuePair *nvp );
#endif /* USE_LDAP */
#endif /* __LDAPQUERY_H__ */
server->control = ctl;
}
-/**
- * Release LDAP control object.
- * \param server Server object.
- */
-static void ldapsvr_release_control( LdapServer *server ) {
- g_return_if_fail( server != NULL );
- ldapctl_free( server->control );
- server->control = NULL;
-}
-
/**
* Free all queries.
* \param server Server object.
{
LdapQuery *incomplete = NULL;
GList *node;
- g_return_if_fail( server != NULL );
+ g_return_val_if_fail( server != NULL, NULL );
node = server->listQuery;
node = g_list_last( node );
gboolean ldapsvr_reuse_previous ( const LdapServer *server,
const QueryRequest *req );
-
#endif /* USE_LDAP */
#endif /* __LDAPSERVER_H__ */
{
while(gtk_events_pending())
gtk_main_iteration();
+ usleep(50000);
}
int main(int argc, char *argv[])
/* ******************************************************************** */
+/* redeclarations to avoid warnings */
+void matcher_parserrestart(FILE *input_file);
+void matcher_parser_init(void);
+void matcher_parser_switch_to_buffer(void * new_buffer);
+void matcher_parser_delete_buffer(void * b);
+int matcher_parserlex(void);
void matcher_parser_start_parsing(FILE *f)
{
AM_CPPFLAGS = \
$(ASPELL_CFLAGS) \
$(GLIB_CFLAGS) \
- $(GTK_CFLAGS)
+ $(GTK_CFLAGS)
EXTRA_DIST = \
README clamav_plugin_gtk.deps
message_callback = callback;
}
+void cl_buildtrie(struct cl_node *root);
+void cl_freetrie(struct cl_node *root);
gint plugin_init(gchar **error)
{
gchar *rcpath;
$(ASPELL_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(OPENSSL_CFLAGS)
+ $(OPENSSL_CFLAGS)
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(GPGME_CFLAGS)
+ $(GPGME_CFLAGS) \
+ -Wno-deprecated-declarations
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(GPGME_CFLAGS)
+ $(GPGME_CFLAGS) \
+ -Wno-deprecated-declarations
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(GPGME_CFLAGS)
+ $(GPGME_CFLAGS) \
+ -Wno-deprecated-declarations
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(ASPELL_CFLAGS) \
- $(OPENSSL_CFLAGS)
+ $(OPENSSL_CFLAGS)
EXTRA_DIST = \
README \
ThemesPage *prefs_themes = (ThemesPage *)page;
ThemesData *tdata = prefs_themes_data;
gchar *buf;
+ const gchar *tmp;
gint i;
/* from gtk/about.c */
GtkStyle *style;
GTK_WIDGET_SET_FLAGS (btn_more, GTK_CAN_DEFAULT);
/* make it look like an uri */
gtk_button_set_relief(GTK_BUTTON(btn_more), GTK_RELIEF_NONE);
- buf = gtk_label_get_text(GTK_LABEL(GTK_BIN(btn_more)->child));
- buf = g_strdup(buf);
+ tmp = gtk_label_get_text(GTK_LABEL(GTK_BIN(btn_more)->child));
+ buf = g_strdup(tmp);
for (i = 0; buf[i] != '\0'; buf[i++] = '_');
gtk_label_set_pattern(GTK_LABEL(GTK_BIN(btn_more)->child), buf);
g_free(buf);
projects / claws.git / commitdiff