Revision: 2118
http://geany.svn.sourceforge.net/geany/?rev=2118&view=rev
Author: frlan
Date: 2007-12-19 12:29:40 -0800 (Wed, 19 Dec 2007)
Log Message:
-----------
Added uk_UA to language list (oops) and fixed a little typo inside ChangeLog
Modified Paths:
--------------
trunk/po/ChangeLog
trunk/po/LINGUAS
Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog 2007-12-19 15:37:10 UTC (rev 2117)
+++ trunk/po/ChangeLog 2007-12-19 20:29:40 UTC (rev 2118)
@@ -33,7 +33,7 @@
2007-10-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
- * svn.po, LINGUAS:
+ * sv.po, LINGUAS:
Added Swedish translation (Thanks to Tony Mattsson)
Modified: trunk/po/LINGUAS
===================================================================
--- trunk/po/LINGUAS 2007-12-19 15:37:10 UTC (rev 2117)
+++ trunk/po/LINGUAS 2007-12-19 20:29:40 UTC (rev 2118)
@@ -1,2 +1,2 @@
# set of available languages (in alphabetic order)
-be bg ca cs de en_GB es fi fr hu it nl pl pt_BR ru sv vi zh_CN zh_TW
+be bg ca cs de en_GB es fi fr hu it nl pl pt_BR ru sv uk_UA vi zh_CN zh_TW
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2116
http://geany.svn.sourceforge.net/geany/?rev=2116&view=rev
Author: eht16
Date: 2007-12-19 05:49:59 -0800 (Wed, 19 Dec 2007)
Log Message:
-----------
Apply patch Jeff Pohlmeyer to handle unknown command line options better (thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/TODO
trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-18 21:46:49 UTC (rev 2115)
+++ trunk/ChangeLog 2007-12-19 13:49:59 UTC (rev 2116)
@@ -1,3 +1,9 @@
+2007-12-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * TODO, src/main.c: Apply patch Jeff Pohlmeyer to handle unknown
+ command line options better (thanks).
+
+
2007-12-18 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* src/about.c, THANKS, po/uk_UA.po, po/LINGUAS:
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2007-12-18 21:46:49 UTC (rev 2115)
+++ trunk/TODO 2007-12-19 13:49:59 UTC (rev 2116)
@@ -5,7 +5,6 @@
Fix bugs:
o fix bug that prevents UTF-16, UTF-32 files from being loaded.
o tagmanager fails on UTF-16/32
- o fix parsing command line args after given filenames
Next version or later:
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2007-12-18 21:46:49 UTC (rev 2115)
+++ trunk/src/main.c 2007-12-19 13:49:59 UTC (rev 2116)
@@ -158,6 +158,7 @@
}
}
+
/* special things for the initial setup of the checkboxes and related stuff
* an action on a setting is only performed if the setting is not equal to the program default
* (all the following code is not perfect but it works for the moment) */
@@ -421,7 +422,6 @@
static void parse_command_line_options(gint *argc, gchar ***argv)
{
- GOptionContext *context;
GError *error = NULL;
// first initialise cl_options fields with default values
@@ -429,13 +429,15 @@
cl_options.goto_line = -1;
cl_options.goto_column = -1;
- context = g_option_context_new(_("[FILES...]"));
- g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
- g_option_group_set_translation_domain(g_option_context_get_main_group(context), GETTEXT_PACKAGE);
- g_option_context_add_group(context, gtk_get_option_group(TRUE));
- g_option_context_parse(context, argc, argv, &error);
- g_option_context_free(context);
+ gtk_init_with_args(argc, argv, _("[FILES...]"), entries, GETTEXT_PACKAGE, &error);
+ if (error != NULL)
+ {
+ g_printerr("Geany: %s\n", error->message);
+ g_error_free(error);
+ exit(1);
+ }
+
if (show_version)
{
printf(PACKAGE " " VERSION " ");
@@ -639,6 +641,7 @@
setup_paths();
locale_init();
+ // gtk_init() is called within parse_command_line_options()
parse_command_line_options(&argc, &argv);
gtk_set_locale();
@@ -681,7 +684,6 @@
VERSION,
gtk_major_version, gtk_minor_version, gtk_micro_version,
glib_major_version, glib_minor_version, glib_micro_version);
- gtk_init(&argc, &argv);
// inits
main_init();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2114
http://geany.svn.sourceforge.net/geany/?rev=2114&view=rev
Author: ntrel
Date: 2007-12-18 09:32:06 -0800 (Tue, 18 Dec 2007)
Log Message:
-----------
Fix parsing correct D class name when inheriting.
Modified Paths:
--------------
trunk/ChangeLog
trunk/tagmanager/c.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-18 17:23:44 UTC (rev 2113)
+++ trunk/ChangeLog 2007-12-18 17:32:06 UTC (rev 2114)
@@ -23,6 +23,8 @@
since r1952, and not in the standard ctags code. Leaving it in the
TagManager code however for backwards compatibility with global tag
files.
+ * tagmanager/c.c:
+ Fix parsing correct D class name when inheriting.
2007-12-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/tagmanager/c.c
===================================================================
--- trunk/tagmanager/c.c 2007-12-18 17:23:44 UTC (rev 2113)
+++ trunk/tagmanager/c.c 2007-12-18 17:32:06 UTC (rev 2114)
@@ -2302,8 +2302,9 @@
else
{
cppUngetc (c);
- if ((isLanguage (Lang_cpp) || isLanguage (Lang_csharp)) &&
- inheritingDeclaration (st->declaration))
+ if (((isLanguage (Lang_cpp) || isLanguage (Lang_csharp)) &&
+ inheritingDeclaration (st->declaration)) ||
+ isLanguage (Lang_d))
{
readParents (st, ':');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2113
http://geany.svn.sourceforge.net/geany/?rev=2113&view=rev
Author: eht16
Date: 2007-12-18 09:23:44 -0800 (Tue, 18 Dec 2007)
Log Message:
-----------
Don't delete geany.ico since it is not installed anymore.
Modified Paths:
--------------
trunk/geany.spec.in
Modified: trunk/geany.spec.in
===================================================================
--- trunk/geany.spec.in 2007-12-18 17:05:56 UTC (rev 2112)
+++ trunk/geany.spec.in 2007-12-18 17:23:44 UTC (rev 2113)
@@ -35,7 +35,6 @@
%__rm -Rf $RPM_BUILD_ROOT
%makeinstall
%__rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
-%__rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.ico
%clean
%__rm -Rf $RPM_BUILD_ROOT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2111
http://geany.svn.sourceforge.net/geany/?rev=2111&view=rev
Author: eht16
Date: 2007-12-18 09:03:39 -0800 (Tue, 18 Dec 2007)
Log Message:
-----------
Add note about using autotools macros like DATADIR.
Add --print-prefix command line option to output installation paths.
Modified Paths:
--------------
trunk/ChangeLog
trunk/HACKING
trunk/doc/geany.1.in
trunk/doc/geany.html
trunk/doc/geany.txt
trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-18 17:01:36 UTC (rev 2110)
+++ trunk/ChangeLog 2007-12-18 17:03:39 UTC (rev 2111)
@@ -3,6 +3,13 @@
* Makefile.am: Don't install pixmaps/geany.ico by default.
* geany.spec.in: Fix mandir path and don't delete icons
(patch by Yura Siamashka, thanks).
+ * src/Makefile.am:
+ Add PREFIX macro.
+ Don't construct LOCALEDIR manually but use autotools $(localedir)
+ variable instead.
+ * HACKING: Add note about using autotools macros like DATADIR.
+ * doc/geany.1.in, doc/geany.html, doc/geany.txt, src/main.c:
+ Add --print-prefix command line option to output installation paths.
2007-12-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/HACKING
===================================================================
--- trunk/HACKING 2007-12-18 17:01:36 UTC (rev 2110)
+++ trunk/HACKING 2007-12-18 17:03:39 UTC (rev 2111)
@@ -87,6 +87,15 @@
(and api_version if changing elements). This is not needed if you're
just appending fields to structs.
+Using pre-defined autotools values
+----------------------------------
+When you are use macros supplied by the autotools like PREFIX, LIBDIR,
+DATADIR and LOCALEDIR be aware that these might not be static strings
+when Geany is configured with --enable-binreloc. Then these macros will
+be replaced by function calls (in src/prefix.h). So, don't use anything
+like printf("Prefix: " PREFIX); but instead use
+printf("Prefix: %s", PREFIX);
+
Adding a file foo.[hc] in src/ or plugins/
------------------------------------------
Add foo.c, foo.h to SRCS in path/Makefile.am.
Modified: trunk/doc/geany.1.in
===================================================================
--- trunk/doc/geany.1.in 2007-12-18 17:01:36 UTC (rev 2110)
+++ trunk/doc/geany.1.in 2007-12-18 17:03:39 UTC (rev 2111)
@@ -39,6 +39,10 @@
For more information please see documentation.
.IP "\fB-p\fP \fB\-\-no-plugins\fP " 10
Don't load plugin support.
+.IP "\fB\fP \fB\-\-print-prefix\fP " 10
+Print installation prefix, the data directory, the lib directory and the locale directory (in
+this order) to stdout, each per line. This is mainly intended for plugin authors to detect
+installation paths.
.IP "\fB-s\fP \fB\-\-no-session\fP " 10
Don't load the previous session's files.
.IP "\fB-t\fP \fB\-\-no-terminal\fP " 10
Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html 2007-12-18 17:01:36 UTC (rev 2110)
+++ trunk/doc/geany.html 2007-12-18 17:03:39 UTC (rev 2111)
@@ -6,7 +6,7 @@
<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" />
<title>Geany</title>
<meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" />
-<meta name="date" content="2007-12-07" />
+<meta name="date" content="2007-12-16" />
<style type="text/css">
/*
@@ -133,7 +133,7 @@
<br />Nick Treleaven
<br />Frank Lanitz</td></tr>
<tr><th class="docinfo-name">Date:</th>
-<td>2007-12-07</td></tr>
+<td>2007-12-16</td></tr>
<tr><th class="docinfo-name">Version:</th>
<td>0.13</td></tr>
</tbody>
@@ -485,6 +485,13 @@
<td>--no-plugins</td>
<td>Do not load plugins or plugin support.</td>
</tr>
+<tr><td><em>none</em></td>
+<td>--print-prefix</td>
+<td>Print installation prefix, the data directory, the lib
+directory and the locale directory (in this order) to
+stdout, each per line. This is mainly intended for plugin
+authors to detect installation paths.</td>
+</tr>
<tr><td>-s</td>
<td>--no-session</td>
<td>Do not load the previous session's files.</td>
@@ -3225,7 +3232,7 @@
<div class="footer">
<hr class="footer" />
<a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2007-12-16 16:51 UTC.
+Generated on: 2007-12-18 17:03 UTC.
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt 2007-12-18 17:01:36 UTC (rev 2110)
+++ trunk/doc/geany.txt 2007-12-18 17:03:39 UTC (rev 2111)
@@ -208,6 +208,11 @@
-p --no-plugins Do not load plugins or plugin support.
+*none* --print-prefix Print installation prefix, the data directory, the lib
+ directory and the locale directory (in this order) to
+ stdout, each per line. This is mainly intended for plugin
+ authors to detect installation paths.
+
-s --no-session Do not load the previous session's files.
-t --no-terminal Do not load terminal support. Use this option if you do
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2007-12-18 17:01:36 UTC (rev 2110)
+++ trunk/src/main.c 2007-12-18 17:03:39 UTC (rev 2111)
@@ -108,6 +108,7 @@
static gboolean generate_tags = FALSE;
static gboolean no_preprocessing = FALSE;
static gboolean ft_names = FALSE;
+static gboolean print_prefix = FALSE;
#ifdef HAVE_PLUGINS
static gboolean no_plugins = FALSE;
#endif
@@ -131,6 +132,7 @@
#ifdef HAVE_PLUGINS
{ "no-plugins", 'p', 0, G_OPTION_ARG_NONE, &no_plugins, N_("Don't load plugins"), NULL },
#endif
+ { "print-prefix", 0, 0, G_OPTION_ARG_NONE, &print_prefix, N_("Print Geany's installation prefix"), 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 },
@@ -445,6 +447,15 @@
exit(0);
}
+ if (print_prefix)
+ {
+ printf("%s\n", PREFIX);
+ printf("%s\n", DATADIR);
+ printf("%s\n", LIBDIR);
+ printf("%s\n", LOCALEDIR);
+ exit(0);
+ }
+
#ifdef GEANY_DEBUG
app->debug_mode = TRUE;
geany_debug("debug mode built in (can't be disabled)");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.