2011-12-31 [mir] 0.6.0cvs61

	* src/mainwindow.c
	    Notify user about load problems with extensions

diff --git a/ChangeLog b/ChangeLog
index e83e4d92c62782d4bcb7523d3cba8298a613401e..a0141c62a269aa9f92dd27819c6328f8fe080d1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-31 [mir]       0.6.0cvs61
+
+       * src/mainwindow.c
+           Notify user about load problems with extensions
+
 2011-12-31 [mir]       0.6.0cvs60
 
        * plugins/xml/xml-plugin.c

diff --git a/PATCHSETS b/PATCHSETS
index aaabab37542a8dd62b8ad053aa259af09aec5e0b..87bf2d93c8f7e001a70fe03ff9fb3011824d9855 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -58,3 +58,4 @@
 ( cvs diff -u -r 1.15 -r 1.16 plugins/ldap/ldap-plugin.c;  ) > 0.6.0cvs58.patchset
 ( cvs diff -u -r 1.3 -r 1.4 src/about.c;  cvs diff -u -r 1.7 -r 1.8 src/extension-loader.c;  cvs diff -u -r 1.3 -r 1.4 src/extension-loader.h;  ) > 0.6.0cvs59.patchset
 ( cvs diff -u -r 1.10 -r 1.11 plugins/xml/xml-plugin.c;  ) > 0.6.0cvs60.patchset
+( cvs diff -u -r 1.8 -r 1.9 src/mainwindow.c;  ) > 0.6.0cvs61.patchset

diff --git a/configure.ac b/configure.ac
index d9914b58c9a21856210c41b38eca582d1a70f570..8751fa3960aa7e6e07c75ba055e56b66a730c32b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index a1c50852ca5abdca3c65ec74d0bd4b9102cb7aa1..74951791b88b221c6f4c102929201b325f1a4792 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -44,6 +44,7 @@
 #include "callbacks.h"
 #include "utils.h"
 #include "extension-loader.h"
+#include "gtk-utils.h"
 
 const gchar* PIXMAPS[PIXMAP_N] = {
     PIXDIR"/claws-contacts_16x16.png",
@@ -640,17 +641,20 @@ void set_status_msg(MainWindow* mainwindow, STATUS id, const gchar* extra) {
 
 void application_start(gboolean compose, gboolean no_extensions) {
     MainWindow* mainwindow = g_new0(MainWindow, 1);
-    gchar* error;
+    gchar* error = NULL;
     
     mainwindow->compose_mode = compose;
     mainwindow->use_extensions = ! no_extensions;
     mainwindow_create(mainwindow);
 
     if (mainwindow->use_extensions) {
-        //debug_set_mode(TRUE);
         init_hooks(mainwindow);
         load_extensions(&error);
-        //debug_set_mode(FALSE);
+        if (error) {
+            show_message(mainwindow->window, GTK_UTIL_MESSAGE_WARNING, "%s", error);
+            g_free(error);
+            error = NULL;
+        }
     }
 
     GList* pixmaps = load_pixmaps();