[Commits] Makefile.am 1.2 1.3 claws-contacts.c 1.2 1.3 extension-loader.c NONE 1.1 extension-loader.h NONE 1.1 extension.c NONE 1.1 extension.h NONE 1.1 mainwindow.c 1.4 1.5 mainwindow.h 1.2 1.3

[miras at claws-mail.org]

Update of /home/claws-mail/contacts/src
In directory claws-mail:/tmp/cvs-serv15618/src

Modified Files:
	Makefile.am claws-contacts.c mainwindow.c mainwindow.h 
Added Files:
	extension-loader.c extension-loader.h extension.c extension.h 
Log Message:
2011-11-30 [mir]	0.6.0cvs34

	* Makefile.am
	* TODO
	* configure.ac
	* extensions/.cvsignore
	* extensions/Makefile.am
	* extensions/export/.cvsignore
	* extensions/export/Makefile.am
	* extensions/export/ldifexport_extension.c
	* extensions/import/.cvsignore
	* extensions/import/Makefile.am
	* extensions/import/ldifimport_extension.c
	* src/Makefile.am
	* src/claws-contacts.c
	* src/extension-loader.c
	* src/extension-loader.h
	* src/extension.c
	* src/extension.h
	* src/mainwindow.c
	* src/mainwindow.h
	    Begin implementing plugable extension feature. 

--- NEW FILE: extension.c ---
(This appears to be a binary file; contents omitted.)

Index: mainwindow.h
===================================================================
RCS file: /home/claws-mail/contacts/src/mainwindow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mainwindow.h	20 Nov 2011 21:24:20 -0000	1.2
+++ mainwindow.h	30 Nov 2011 23:35:12 -0000	1.3
@@ -104,7 +104,7 @@
     STATUS_MSG_SEARCHING
 } STATUS;
 
-void application_start(gboolean compose);
+void application_start(gboolean compose, gboolean avoid_extensions);
 void set_status_msg(MainWindow* mainwindow, STATUS id, const gchar* extra);
 
 G_END_DECLS

--- NEW FILE: extension.h ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: extension-loader.c ---
(This appears to be a binary file; contents omitted.)

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/contacts/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	14 Nov 2011 22:06:43 -0000	1.2
+++ Makefile.am	30 Nov 2011 23:35:12 -0000	1.3
@@ -17,12 +17,12 @@
 AM_CPPFLAGS = \
 		-DG_LOG_DOMAIN=\"Claws-Contacts\" \
 		-DPLUGINDIR=\"@PLUGINDIR@\" \
+		-DEXTENSIONDIR=\"@EXTENSIONDIR@\" \
 		$(LIBGCRYPT_CFLAGS)
 
 claws_contacts_SOURCES = \
 		    claws-contacts.c \
 		    mainwindow.c \
-		    mainwindow.h \
 		    callbacks.c \
 		    callbacks.h \
 		    utils.c \
@@ -37,14 +37,18 @@
 		    printing.c \
 		    printing.h \
 		    settings.c \
-		    settings.h
-
+		    settings.h \
+			extension.c \
+			extension-loader.c \
+			extension-loader.h
 
 claws_contactsincludedir = $(pkgincludedir)
 claws_contactsinclude_HEADERS = \
 		    utils.h \
 		    plugin.h \
-		    gtk-utils.h
+		    gtk-utils.h \
+		    mainwindow.h \
+			extension.h
 
 claws_contacts_LDADD= \
 		   @GLIB_LIBS@ \

Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/contacts/src/mainwindow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mainwindow.c	14 Nov 2011 22:06:43 -0000	1.4
+++ mainwindow.c	30 Nov 2011 23:35:12 -0000	1.5
@@ -43,6 +43,7 @@
 #include "mainwindow.h"
 #include "callbacks.h"
 #include "utils.h"
+#include "extension-loader.h"
 
 const gchar* PIXMAPS[PIXMAP_N] = {
     PIXDIR"/claws-contacts_16x16.png",
@@ -637,12 +638,16 @@
     g_string_free(msg, TRUE);
 }
 
-void application_start(gboolean compose) {
+void application_start(gboolean compose, gboolean avoid_extensions) {
     MainWindow* mainwindow = g_new0(MainWindow, 1);
     
     mainwindow->compose_mode = compose;
     mainwindow_create(mainwindow);
 
+    if (! avoid_extensions) {
+        init_hooks(mainwindow);
+    }
+
     GList* pixmaps = load_pixmaps();
     gtk_window_set_default_icon_list(pixmaps);
     g_list_free(pixmaps);

Index: claws-contacts.c
===================================================================
RCS file: /home/claws-mail/contacts/src/claws-contacts.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- claws-contacts.c	4 Oct 2011 20:21:40 -0000	1.2
+++ claws-contacts.c	30 Nov 2011 23:35:12 -0000	1.3
@@ -48,6 +48,7 @@
 static gboolean compose = FALSE;
 static gboolean service = FALSE;
 static gboolean keep = FALSE;
+static gboolean no_extensions = FALSE;
 #if DEBUG
 static gboolean debug_mode = TRUE;
 #else
@@ -59,6 +60,8 @@
         N_("Run in compose mode"), NULL},
     {"keep", 'k', 0, G_OPTION_ARG_NONE, &keep,
         N_("Dont fork in service mode"), NULL},
+    {"noext", 'n', 0, G_OPTION_ARG_NONE, &no_extensions,
+        N_("Avoid loading any extensions"), NULL},
     {"service", 's', 0, G_OPTION_ARG_NONE, &service,
         N_("Run as a DBus service"), NULL},
     {"debug", 'd', 0, G_OPTION_ARG_NONE, &debug_mode,
@@ -110,11 +113,13 @@
         return EXIT_FAILURE;
     }
     
-    if (service)
+    if (service) {
         start_service(keep);
+        //start_service(keep, no_extensions);
+    }
     else {
         gtk_init(&argc, &argv);
-        application_start(compose);
+        application_start(compose, no_extensions);
     }
 
     return EXIT_SUCCESS;

--- NEW FILE: extension-loader.h ---
(This appears to be a binary file; contents omitted.)