SF.net SVN: geany: [1665] trunk

[ntrel at users.sourceforge.net]

Revision: 1665
          http://svn.sourceforge.net/geany/?rev=1665&view=rev
Author:   ntrel
Date:     2007-07-05 05:15:54 -0700 (Thu, 05 Jul 2007)

Log Message:
-----------
Add -p, --no-plugins options to disable plugin support.

Modified Paths:
--------------
    trunk/doc/geany.docbook
    trunk/src/main.c

Modified: trunk/doc/geany.docbook
===================================================================
--- trunk/doc/geany.docbook	2007-07-04 17:42:01 UTC (rev 1664)
+++ trunk/doc/geany.docbook	2007-07-05 12:15:54 UTC (rev 1665)
@@ -264,9 +264,15 @@
 								</entry>
 							</row>
 							<row>
+								<entry>-p</entry>
+								<entry>--no-plugins</entry>
+								<entry>Do not load plugins or plugin support.
+								</entry>
+							</row>
+							<row>
 								<entry>-s</entry>
 								<entry>--no-session</entry>
-								<entry>Don't load the previous session's files.
+								<entry>Do not load the previous session's files.
 								</entry>
 							</row>
 							<row>

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2007-07-04 17:42:01 UTC (rev 1664)
+++ trunk/src/main.c	2007-07-05 12:15:54 UTC (rev 1665)
@@ -96,7 +96,9 @@
 static gboolean generate_datafiles = FALSE;
 static gboolean generate_tags = FALSE;
 static gboolean ft_names = FALSE;
+static gboolean no_plugins = FALSE;
 
+// in alphabetical order of short options
 static GOptionEntry entries[] =
 {
 	{ "column", 0, 0, G_OPTION_ARG_INT, &cl_options.goto_column, N_("set initial column number for the first opened file (useful in conjunction with --line)"), NULL },
@@ -111,6 +113,7 @@
 	{ "line", 'l', 0, G_OPTION_ARG_INT, &cl_options.goto_line, N_("set initial line number for the first opened file"), NULL },
 	{ "no-msgwin", 'm', 0, G_OPTION_ARG_NONE, &no_msgwin, N_("don't show message window at startup"), NULL },
 	{ "no-ctags", 'n', 0, G_OPTION_ARG_NONE, &ignore_global_tags, N_("don't load auto completion data (see documentation)"), NULL },
+	{ "no-plugins", 'p', 0, G_OPTION_ARG_NONE, &no_plugins, N_("don't load plugins"), NULL },
 	{ "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("don't load the previous session's files"), NULL },
 #ifdef HAVE_VTE
 	{ "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("don't load terminal support"), NULL },
@@ -772,7 +775,8 @@
 
 #ifdef HAVE_PLUGINS
 	// load any enabled plugins just before we draw the main window
-	plugins_init();
+	if (! no_plugins)
+		plugins_init();
 #endif
 
 	// finally realize the window to show the user what we have done
@@ -806,7 +810,8 @@
 #endif
 
 #ifdef HAVE_PLUGINS
-	plugins_free();
+	if (! no_plugins)
+		plugins_free();
 #endif
 	navqueue_free();
 	keybindings_free();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.