Revision: 2041 http://geany.svn.sourceforge.net/geany/?rev=2041&view=rev Author: eht16 Date: 2007-11-11 01:09:47 -0800 (Sun, 11 Nov 2007)
Log Message: ----------- Don't compile plugin command line option when plugin support is disabled.
Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-11-11 09:03:01 UTC (rev 2040) +++ trunk/ChangeLog 2007-11-11 09:09:47 UTC (rev 2041) @@ -1,3 +1,12 @@ +2007-11-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/templates.c, src/utils.c, src/utils.h: + Remove utils_get_date() and add format argument to + utils_get_date_time(). + * src/main.c: Don't compile plugin command line option when plugin + support is disabled. + + 2007-11-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/prefs.c:
Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2007-11-11 09:03:01 UTC (rev 2040) +++ trunk/src/main.c 2007-11-11 09:09:47 UTC (rev 2041) @@ -106,7 +106,9 @@ static gboolean generate_tags = FALSE; static gboolean no_preprocessing = FALSE; static gboolean ft_names = FALSE; +#ifdef HAVE_PLUGINS static gboolean no_plugins = FALSE; +#endif
// in alphabetical order of short options static GOptionEntry entries[] = @@ -124,7 +126,9 @@ { "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 }, +#ifdef HAVE_PLUGINS { "no-plugins", 'p', 0, G_OPTION_ARG_NONE, &no_plugins, N_("Don't load plugins"), NULL }, +#endif { "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 }, @@ -595,7 +599,9 @@ #endif if (no_msgwin) ui_prefs.msgwindow_visible = FALSE;
+#ifdef HAVE_PLUGINS want_plugins = prefs.load_plugins && !no_plugins; +#endif }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.