diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-06-27 00:02:06 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2000-06-27 00:02:06 +0800 |
| commit | 187f4c8b0c9ada3c5c0362ebc23cbef0f7987955 (patch) | |
| tree | 059b503305ec9b5bd2c2e743ac7ec46e476e6edf | |
| parent | 9c515ee30bc2498ab3fa37d34dcc02d051a39e56 (diff) | |
| download | gsoc2013-evolution-187f4c8b0c9ada3c5c0362ebc23cbef0f7987955.tar.gz gsoc2013-evolution-187f4c8b0c9ada3c5c0362ebc23cbef0f7987955.tar.zst gsoc2013-evolution-187f4c8b0c9ada3c5c0362ebc23cbef0f7987955.zip | |
commenting out of some GDK_THREADS_*() junk that was causing a lock
also fixed an assignment problem (var = void) in mail-config.c
svn path=/trunk/; revision=3738
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/folder-browser.c | 4 | ||||
| -rw-r--r-- | mail/mail-config.c | 2 | ||||
| -rw-r--r-- | mail/mail-threads.c | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 90d5f5d9ed..7ee2d3492f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-06-26 Jeffrey Stedfast <fejj@helixcode.com> + + * mail-config.c (error_dialog): va_start() returns void, don't + assign it's retval to a variable. + 2000-06-26 Ettore Perazzoli <ettore@helixcode.com> * main.c (main): Call `GDK_THREADS_ENTER()' and diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 17b7df578c..61378cd0c2 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -119,7 +119,9 @@ folder_browser_load_folder (FolderBrowser *fb, const char *name) if (*ptr == '/') { if (url && url->path) { fprintf (stderr, "namespace = %s\n", url->path + 1); - ptr += strlen (url->path) + 1; + ptr += strlen (url->path); + if (*ptr == '/') + ptr++; } if (*ptr == '/') diff --git a/mail/mail-config.c b/mail/mail-config.c index 56ed19824a..8b1f89bf5f 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -163,7 +163,7 @@ error_dialog (GtkWidget *parent_finder, const char *fmt, ...) parent = gtk_widget_get_ancestor (parent_finder, GTK_TYPE_WINDOW); - ap = va_start (ap, fmt); + va_start (ap, fmt); msg = g_strdup_vprintf (fmt, ap); va_end (ap); diff --git a/mail/mail-threads.c b/mail/mail-threads.c index 0905c401f5..949c9c4a7c 100644 --- a/mail/mail-threads.c +++ b/mail/mail-threads.c @@ -576,9 +576,9 @@ static void *dispatch_func( void *data ) msg.message = clur->prettyname; write( WRITER, &msg, sizeof( msg ) ); - GDK_THREADS_ENTER (); + /*GDK_THREADS_ENTER ();*/ (clur->callback)( clur->data ); - GDK_THREADS_LEAVE (); + /*GDK_THREADS_LEAVE ();*/ msg.type = FINISHED; msg.func = clur->cleanup; /* NULL is ok */ |