[Goodies-commits] r7725 - in xfce4-mailwatch-plugin/trunk: . libmailwatch-core panel-plugin
Brian Tarricone
kelnos at xfce.org
Thu Jul 16 07:50:00 CEST 2009
Author: kelnos
Date: 2009-07-16 05:50:00 +0000 (Thu, 16 Jul 2009)
New Revision: 7725
Modified:
xfce4-mailwatch-plugin/trunk/configure.ac.in
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-common.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mh.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-net-conn.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-utils.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c
xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c
Log:
fix/suppress a bunch of warnings
Modified: xfce4-mailwatch-plugin/trunk/configure.ac.in
===================================================================
--- xfce4-mailwatch-plugin/trunk/configure.ac.in 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/configure.ac.in 2009-07-16 05:50:00 UTC (rev 7725)
@@ -95,6 +95,9 @@
[Define if IPv6 support should be enabled])
fi
+dnl suppress warnings related to GStaticMutexes
+XDT_SUPPORTED_FLAGS([CFLAGS], [-fno-strict-aliasing])
+
dnl check for debugging support
XDT_FEATURE_DEBUG
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-common.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-common.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-common.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -27,7 +27,7 @@
static GStaticMutex big_happy_mailwatch_mx = G_STATIC_MUTEX_INIT;
GQuark
-xfce_mailwatch_get_error_quark()
+xfce_mailwatch_get_error_quark(void)
{
static GQuark q = 0;
@@ -38,12 +38,12 @@
}
void
-xfce_mailwatch_threads_enter()
+xfce_mailwatch_threads_enter(void)
{
g_static_mutex_lock(&big_happy_mailwatch_mx);
}
-void xfce_mailwatch_threads_leave()
+void xfce_mailwatch_threads_leave(void)
{
g_static_mutex_unlock(&big_happy_mailwatch_mx);
}
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -184,7 +184,7 @@
g_error_free(error);
}
- if(recvd == len)
+ if((gsize)recvd == len)
return -1;
buf[recvd] = '\n';
@@ -272,7 +272,7 @@
g_snprintf(buf, BUFSIZE, "%05d CAPABILITY\r\n", ++imailbox->imap_tag);
bout = imap_send(imailbox, net_conn, buf);
DBG("sent CAPABILITY (%d)", bout);
- if(bout != strlen(buf))
+ if(bout != (gint)strlen(buf))
goto cleanuperr;
bin = imap_recv_command(imailbox, net_conn, buf, BUFSIZE);
DBG("response from CAPABILITY (%d): %s", bin, bin>0?buf:"(nada)");
@@ -353,7 +353,7 @@
++imailbox->imap_tag, username, password);
bout = imap_send(imailbox, net_conn, buf);
DBG("sent login (%d)", bout);
- if(bout != strlen(buf))
+ if(bout != (gint)strlen(buf))
goto cleanuperr;
/* and see if we actually got auth-ed */
@@ -418,7 +418,7 @@
TRACE("entering");
g_snprintf(buf, BUFSIZE, "%05d CAPABILITY\r\n", ++imailbox->imap_tag);
- if(imap_send(imailbox, net_conn, buf) != strlen(buf))
+ if(imap_send(imailbox, net_conn, buf) != (gint)strlen(buf))
return FALSE;
bin = imap_recv_command(imailbox, net_conn, buf, BUFSIZE);
@@ -435,7 +435,7 @@
}
g_snprintf(buf, BUFSIZE, "%05d STARTTLS\r\n", ++imailbox->imap_tag);
- if(imap_send(imailbox, net_conn, buf) != strlen(buf))
+ if(imap_send(imailbox, net_conn, buf) != (gint)strlen(buf))
return FALSE;
if(imap_recv_command(imailbox, net_conn, buf, BUFSIZE) < 0)
@@ -557,7 +557,7 @@
g_snprintf(buf, sizeof(buf), "%05d STATUS %s (UNSEEN)\r\n",
++imailbox->imap_tag, mailbox_name);
- if(imap_send(imailbox, net_conn, buf) != strlen(buf))
+ if(imap_send(imailbox, net_conn, buf) != (gint)strlen(buf))
return 0;
DBG(" successfully sent cmd '%s'", buf);
@@ -859,7 +859,7 @@
gpointer user_data)
{
XfceMailwatchIMAPMailbox *imailbox = user_data;
- gint value = gtk_spin_button_get_value_as_int(sb) * 60;
+ guint value = gtk_spin_button_get_value_as_int(sb) * 60;
if(imailbox->timeout == value)
return;
@@ -919,7 +919,7 @@
g_snprintf(buf, BUFSIZE, "%05d LIST \"%s\" \"%%\"\r\n",
++imailbox->imap_tag, cur_folder);
- if(imap_send(imailbox, net_conn, buf) != strlen(buf))
+ if(imap_send(imailbox, net_conn, buf) != (gint)strlen(buf))
return FALSE;
DBG("sent LIST: '%s'", buf);
@@ -1892,7 +1892,7 @@
XfceMailwatchIMAPMailbox *imailbox = XFCE_MAILWATCH_IMAP_MAILBOX(mailbox);
GList *params = NULL;
XfceMailwatchParam *param;
- gint i;
+ guint i;
g_mutex_lock(imailbox->config_mx);
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -291,7 +291,7 @@
static void
maildir_interval_changed_cb( GtkWidget *spinner, XfceMailwatchMaildirMailbox *maildir ) {
- gint value = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinner ) ) * 60;
+ guint value = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinner ) ) * 60;
DBG( "-->>" );
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -127,7 +127,7 @@
error = NULL;
}
- if ( mbox->size && st.st_size > mbox->size ) {
+ if ( mbox->size && st.st_size > (guint)mbox->size ) {
/* G_SEEK_CUR is same as G_SEEK_SET in this context. */
if ( g_io_channel_seek_position( ioc, mbox->size, G_SEEK_CUR, &error ) != G_IO_STATUS_NORMAL ) {
xfce_mailwatch_log_message( mbox->mailwatch,
@@ -181,7 +181,7 @@
}
g_io_channel_unref( ioc );
- if ( st.st_size > mbox->size && num_new <= mbox->new_messages ) {
+ if ( st.st_size > (guint)mbox->size && num_new <= mbox->new_messages ) {
/* Assume mailbox opened and some headers added by client */
num_new = mbox->new_messages = 0;
}
@@ -197,7 +197,7 @@
g_free( mailbox );
}
-gpointer
+static gpointer
mbox_check_mail_thread( gpointer data )
{
XfceMailwatchMboxMailbox *mbox = XFCE_MAILWATCH_MBOX_MAILBOX( data );
@@ -336,7 +336,7 @@
static void
mbox_interval_changed_cb( GtkWidget *spinner, XfceMailwatchMboxMailbox *mbox ) {
- gint val = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinner ) ) * 60;
+ guint val = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinner ) ) * 60;
if( val == mbox->interval )
return;
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mh.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mh.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mh.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -546,7 +546,7 @@
static void
mh_timeout_changed_cb( GtkWidget *spinner, XfceMailwatchMHMailbox *mh )
{
- gint value = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinner ) ) * 60;
+ guint value = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( spinner ) ) * 60;
DBG( "-->>" );
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -126,7 +126,7 @@
g_error_free(error);
}
- if(recvd == len)
+ if((gsize)recvd == len)
return -1;
buf[recvd] = '\n';
@@ -256,7 +256,7 @@
g_snprintf(buf, BUFSIZE, "USER %s\r\n", username);
bout = pop3_send(pmailbox, buf);
DBG("sent user (%d)", bout);
- if(bout != strlen(buf))
+ if(bout != (gint)strlen(buf))
return FALSE;
/* check for OK response */
@@ -269,7 +269,7 @@
g_snprintf(buf, BUFSIZE, "PASS %s\r\n", password);
bout = pop3_send(pmailbox, buf);
DBG("sent password (%d)", bout);
- if(bout != strlen(buf))
+ if(bout != (gint)strlen(buf))
return FALSE;
/* check for OK response */
@@ -672,7 +672,7 @@
gpointer user_data)
{
XfceMailwatchPOP3Mailbox *pmailbox = user_data;
- gint value = gtk_spin_button_get_value_as_int(sb) * 60;
+ guint value = gtk_spin_button_get_value_as_int(sb) * 60;
if(value == pmailbox->timeout)
return;
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-net-conn.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-net-conn.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-net-conn.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -96,7 +96,7 @@
const gchar *line_terminator;
gint fd;
- guint actual_port;
+ gint actual_port;
guchar *buffer;
gsize buffer_len;
@@ -358,7 +358,7 @@
void
-xfce_mailwatch_net_conn_init()
+xfce_mailwatch_net_conn_init(void)
{
static gboolean __inited = FALSE;
@@ -763,7 +763,7 @@
break;
else if(ret < 0 && EINTR != errno) {
g_set_error(error, XFCE_MAILWATCH_ERROR,
- XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
+ XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno));
return -1;
} else if(!block)
return 0;
@@ -773,41 +773,43 @@
if(ret < 0 && EINTR != errno) {
if(error) {
g_set_error(error, XFCE_MAILWATCH_ERROR,
- XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
+ XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno));
}
return -1;
} else if(!SHOULD_CONTINUE(net_conn)) {
if(error) {
g_set_error(error, XFCE_MAILWATCH_ERROR,
- XFCE_MAILWATCH_ERROR_ABORTED, _("Operation aborted"));
+ XFCE_MAILWATCH_ERROR_ABORTED, "%s",
+ _("Operation aborted"));
}
return -1;
} else if(TIMER_EXPIRED(RECV_TIMEOUT)) {
if(error) {
g_set_error(error, XFCE_MAILWATCH_ERROR,
- XFCE_MAILWATCH_ERROR_FAILED, strerror(ETIMEDOUT));
+ XFCE_MAILWATCH_ERROR_FAILED, "%s",
+ strerror(ETIMEDOUT));
}
return -1;
}
#ifdef HAVE_SSL_SUPPORT
if(net_conn->is_secure) {
- gint ret;
+ gint gret;
code = XFCE_MAILWATCH_ERROR_FAILED;
TIMER_START;
do {
- ret = gnutls_record_recv(net_conn->gt_session, buf, buf_len);
+ gret = gnutls_record_recv(net_conn->gt_session, buf, buf_len);
- if(GNUTLS_E_REHANDSHAKE == ret) {
+ if(GNUTLS_E_REHANDSHAKE == gret) {
if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error))
return -1;
- ret = GNUTLS_E_AGAIN;
+ gret = GNUTLS_E_AGAIN;
}
- } while((GNUTLS_E_INTERRUPTED == ret || GNUTLS_E_AGAIN == ret)
+ } while((GNUTLS_E_INTERRUPTED == gret || GNUTLS_E_AGAIN == gret)
&& !TIMER_EXPIRED(RECV_TIMEOUT) && SHOULD_CONTINUE(net_conn));
- if(ret < 0) {
+ if(gret < 0) {
if(error) {
if(!SHOULD_CONTINUE(net_conn)) {
code = XFCE_MAILWATCH_ERROR_ABORTED;
@@ -815,7 +817,7 @@
} else if(TIMER_EXPIRED(RECV_TIMEOUT))
reason = strerror(ETIMEDOUT);
else
- reason = gnutls_strerror(ret);
+ reason = gnutls_strerror(gret);
g_set_error(error, XFCE_MAILWATCH_ERROR, code,
_("Failed to receive encrypted data: %s"),
@@ -824,20 +826,20 @@
bin = -1;
} else
- bin = ret;
+ bin = gret;
} else
#endif
{
- gint ret;
+ gint pret;
code = XFCE_MAILWATCH_ERROR_FAILED;
TIMER_START;
do {
- ret = recv(net_conn->fd, buf, buf_len, MSG_NOSIGNAL);
- } while(ret < 0 && (EINTR == errno || EAGAIN == errno)
+ pret = recv(net_conn->fd, buf, buf_len, MSG_NOSIGNAL);
+ } while(pret < 0 && (EINTR == errno || EAGAIN == errno)
&& !TIMER_EXPIRED(RECV_TIMEOUT) && SHOULD_CONTINUE(net_conn));
- if(ret < 0) {
+ if(pret < 0) {
if(error) {
if(!SHOULD_CONTINUE(net_conn)) {
code = XFCE_MAILWATCH_ERROR_ABORTED;
@@ -852,7 +854,7 @@
}
bin = -1;
} else
- bin = ret;
+ bin = pret;
}
return bin;
@@ -877,7 +879,7 @@
net_conn->buffer = NULL;
net_conn->buffer_len = 0;
- if(bin == buf_len)
+ if(bin == (gint)buf_len)
return bin;
else {
buf += bin;
@@ -952,11 +954,11 @@
}
} while(!p);
- if(buf_len < p - (gchar *)net_conn->buffer) {
+ if((gint)buf_len < p - (gchar *)net_conn->buffer) {
if(error) {
g_set_error(error, XFCE_MAILWATCH_ERROR, 0,
- _("Buffer is not large enough to hold a full line (%d < %d)"),
- buf_len, p - (gchar *)net_conn->buffer);
+ _("Buffer is not large enough to hold a full line (%" G_GSIZE_FORMAT " < %d)"),
+ buf_len, (gint)(p - (gchar *)net_conn->buffer));
}
return -1;
}
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-utils.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-utils.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-utils.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -237,7 +237,7 @@
gchar **str)
{
gchar *s, *p;
- gint i;
+ guint i;
gint c;
const guchar *q;
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -101,7 +101,7 @@
#define N_BUILTIN_MAILBOX_TYPES (sizeof(builtin_mailbox_types)/sizeof(builtin_mailbox_types[0]))
static GList *
-mailwatch_load_mailbox_types()
+mailwatch_load_mailbox_types(void)
{
GList *mailbox_types = NULL;
gint i;
@@ -114,7 +114,7 @@
}
XfceMailwatch *
-xfce_mailwatch_new()
+xfce_mailwatch_new(void)
{
XfceMailwatch *mailwatch;
@@ -753,7 +753,7 @@
XfceMailwatchMailboxType *mbox_type;
GtkRequisition req;
- if(active_index >= g_list_length(mailwatch->mailbox_types))
+ if(active_index >= (gint)g_list_length(mailwatch->mailbox_types))
return;
mbox_type = g_list_nth_data(mailwatch->mailbox_types, active_index);
@@ -812,7 +812,7 @@
if(gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
gint active = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
- if(active >= 0 && active < g_list_length(mailwatch->mailbox_types))
+ if(active >= 0 && (guint)active < g_list_length(mailwatch->mailbox_types))
new_mtype = g_list_nth_data(mailwatch->mailbox_types, active);
}
gtk_widget_destroy(dlg);
@@ -1046,36 +1046,36 @@
void
xfce_mailwatch_signal_connect(XfceMailwatch *mailwatch,
- XfceMailwatchSignal signal, XMCallback callback, gpointer user_data)
+ XfceMailwatchSignal signal_, XMCallback callback, gpointer user_data)
{
g_return_if_fail(mailwatch && callback
- && signal < XFCE_MAILWATCH_NUM_SIGNALS);
+ && signal_ < XFCE_MAILWATCH_NUM_SIGNALS);
- mailwatch->xm_callbacks[signal] =
- g_list_append(mailwatch->xm_callbacks[signal], callback);
- mailwatch->xm_data[signal] = g_list_append(mailwatch->xm_data[signal],
+ mailwatch->xm_callbacks[signal_] =
+ g_list_append(mailwatch->xm_callbacks[signal_], callback);
+ mailwatch->xm_data[signal_] = g_list_append(mailwatch->xm_data[signal_],
user_data);
}
void
xfce_mailwatch_signal_disconnect(XfceMailwatch *mailwatch,
- XfceMailwatchSignal signal, XMCallback callback, gpointer user_data)
+ XfceMailwatchSignal signal_, XMCallback callback, gpointer user_data)
{
GList *cl, *dl;
g_return_if_fail(mailwatch && callback
- && signal < XFCE_MAILWATCH_NUM_SIGNALS);
+ && signal_ < XFCE_MAILWATCH_NUM_SIGNALS);
- for(cl = mailwatch->xm_callbacks[signal], dl = mailwatch->xm_data[signal];
+ for(cl = mailwatch->xm_callbacks[signal_], dl = mailwatch->xm_data[signal_];
cl && dl;
cl = cl->next, dl = dl->next)
{
XMCallback a_callback = cl->data;
if(callback == a_callback) {
- mailwatch->xm_callbacks[signal] =
- g_list_delete_link(mailwatch->xm_callbacks[signal], cl);
- mailwatch->xm_data[signal] =
- g_list_delete_link(mailwatch->xm_data[signal], dl);
+ mailwatch->xm_callbacks[signal_] =
+ g_list_delete_link(mailwatch->xm_callbacks[signal_], cl);
+ mailwatch->xm_data[signal_] =
+ g_list_delete_link(mailwatch->xm_data[signal_], dl);
break;
}
}
Modified: xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c 2009-07-15 13:58:56 UTC (rev 7724)
+++ xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin.c 2009-07-16 05:50:00 UTC (rev 7725)
@@ -240,7 +240,7 @@
mwp);
}
- while(gtk_tree_model_iter_n_children(GTK_TREE_MODEL(mwp->loglist), NULL) > mwp->log_lines) {
+ while(gtk_tree_model_iter_n_children(GTK_TREE_MODEL(mwp->loglist), NULL) > (gint)mwp->log_lines) {
if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(mwp->loglist), &iter, NULL, 0))
gtk_list_store_remove(mwp->loglist, &iter);
}
@@ -1079,7 +1079,7 @@
#ifdef HAVE_XFCE_POSIX_SIGNAL_HANDLER_INIT
static void
-mailwatch_handle_sigusr2(gint signal,
+mailwatch_handle_sigusr2(gint signal_,
gpointer user_data)
{
XfceMailwatchPlugin *mwp = user_data;
More information about the Goodies-commits
mailing list