Revision: 2460
http://geany.svn.sourceforge.net/geany/?rev=2460&view=rev
Author: eht16
Date: 2008-04-09 09:08:34 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Add an explicit check for a C++ compiler (#1938040).
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.in
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-08 21:36:49 UTC (rev 2459)
+++ trunk/ChangeLog 2008-04-09 16:08:34 UTC (rev 2460)
@@ -1,3 +1,9 @@
+2008-04-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * configure.in:
+ Add an explicit check for a C++ compiler (#1938040).
+
+
2008-04-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/document.c, src/document.h, src/main.c, src/project.c:
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-04-08 21:36:49 UTC (rev 2459)
+++ trunk/configure.in 2008-04-09 16:08:34 UTC (rev 2460)
@@ -13,6 +13,13 @@
AC_PROG_CC
AC_PROG_CXX
+# check for C++ compiler explicitly and fail if none is found, do this check
+# after AC_PROG_CXX has set the CXX environment variable
+AC_CHECK_PROG([have_cxx], [$CXX], [yes], [no])
+if test "x$have_cxx" = "xno"; then
+ AC_MSG_ERROR([No C++ compiler not found. Please install a C++ compiler.])
+fi
+
#AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2457
http://geany.svn.sourceforge.net/geany/?rev=2457&view=rev
Author: eht16
Date: 2008-04-08 08:10:05 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
Fix hardcoded make command
Modified Paths:
--------------
trunk/src/makefile.win32
Modified: trunk/src/makefile.win32
===================================================================
--- trunk/src/makefile.win32 2008-04-08 15:00:06 UTC (rev 2456)
+++ trunk/src/makefile.win32 2008-04-08 15:10:05 UTC (rev 2457)
@@ -72,7 +72,7 @@
# this calls parent clean-local target because del ../file won't work
clean:
-$(RM) deps.mak *.o
- cd .. && make -f makefile.win32 clean-local && cd src
+ cd .. && $(MAKE) -f makefile.win32 clean-local && cd src
exec:
$(EXECDIR)\geany.exe
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2456
http://geany.svn.sourceforge.net/geany/?rev=2456&view=rev
Author: eht16
Date: 2008-04-08 08:00:06 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
Fix compiler warnings by correct type casting.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/win32.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-08 14:44:34 UTC (rev 2455)
+++ trunk/ChangeLog 2008-04-08 15:00:06 UTC (rev 2456)
@@ -8,6 +8,8 @@
* Makefile.am, scripts/intl_stats.sh, po/intl_stats.sh:
Move intl_stats.sh script back to po directory to not have to
include the scripts directory in the distribution.
+ * src/win32.c:
+ Fix compiler warnings by correct type casting.
2008-04-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/win32.c
===================================================================
--- trunk/src/win32.c 2008-04-08 14:44:34 UTC (rev 2455)
+++ trunk/src/win32.c 2008-04-08 15:00:06 UTC (rev 2456)
@@ -1145,6 +1145,8 @@
HRESULT hres;
IShellLinkW *pslW = NULL;
IPersistFile *ppf = NULL;
+ LPVOID pslWV = NULL;
+ LPVOID ppfV = NULL;
/* Check if the file is empty first because IShellLink::Resolve for some reason succeeds
* with an empty file and returns an empty "link target". (#524151) */
@@ -1160,18 +1162,20 @@
CoInitialize(NULL);
hres = CoCreateInstance(
- &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID *) &pslW);
+ &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, &pslWV);
if (SUCCEEDED(hres))
{
/* The IShellLink interface supports the IPersistFile interface.
* Get an interface pointer to it. */
- hres = pslW->lpVtbl->QueryInterface(pslW, &IID_IPersistFile, (LPVOID *) &ppf);
+ pslW = (IShellLinkW*) pslWV;
+ hres = pslW->lpVtbl->QueryInterface(pslW, &IID_IPersistFile, &ppfV);
}
if (SUCCEEDED(hres))
{
/* Load the file. */
+ ppf = (IPersistFile*) ppfV;
hres = ppf->lpVtbl->Load(ppf, link, STGM_READ);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2455
http://geany.svn.sourceforge.net/geany/?rev=2455&view=rev
Author: eht16
Date: 2008-04-08 07:44:34 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
Move intl_stats.sh script back to po directory to not have to include the scripts directory in the distribution.
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
Added Paths:
-----------
trunk/po/intl_stats.sh
Removed Paths:
-------------
trunk/scripts/intl_stats.sh
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-08 14:20:24 UTC (rev 2454)
+++ trunk/ChangeLog 2008-04-08 14:44:34 UTC (rev 2455)
@@ -5,6 +5,9 @@
other documents are open.
* src/editor.c:
Backport a bugfix from Scite to fix folding problems.
+ * Makefile.am, scripts/intl_stats.sh, po/intl_stats.sh:
+ Move intl_stats.sh script back to po directory to not have to
+ include the scripts directory in the distribution.
2008-04-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-04-08 14:20:24 UTC (rev 2454)
+++ trunk/Makefile.am 2008-04-08 14:44:34 UTC (rev 2455)
@@ -30,7 +30,7 @@
HACKING \
README.I18N \
README.Packagers \
- scripts/intl_stats.sh \
+ po/intl_stats.sh \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
Copied: trunk/po/intl_stats.sh (from rev 2452, trunk/scripts/intl_stats.sh)
===================================================================
--- trunk/po/intl_stats.sh (rev 0)
+++ trunk/po/intl_stats.sh 2008-04-08 14:44:34 UTC (rev 2455)
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# Little shell script to display some basic statistics about Geany's translation
+# files. It also checks the menu accelerators.
+#
+# Copyright 2007-2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+# Copyright 2007-2008 Frank Lanitz <enrico(dot)troeger(at)uvena(dot)de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+check_accelerators=""
+linguas=""
+me=`basename $0`
+
+
+usage()
+{
+ echo "usage: $me [OPTION] [languages...]"
+ echo
+ echo "OPTIONs are:"
+ echo "-h --help this help screen"
+ echo "-a --accelerators check also for menu accelerators"
+ echo "languages list of language codes which should be tested"
+ echo
+ echo "example: $me -a de fr hu"
+}
+
+
+# parse cmd line arguments
+while [ $# -gt 0 ]
+do
+ case $1 in
+ --accelerators)
+ check_accelerators="--check-accelerators=_"
+ ;;
+ -a)
+ check_accelerators="--check-accelerators=_"
+ ;;
+ --help)
+ usage;
+ exit 1;
+ ;;
+ -h)
+ usage;
+ exit 1;
+ ;;
+ *)
+ linguas="$linguas "$1
+ ;;
+ esac
+ shift
+done
+
+
+
+# if no languages where specified on the command line, take all listed languages in LINGUAS
+if [ -z "$linguas" ]
+then
+ linguas=`sed -e '/^#/d' po/LINGUAS`
+fi
+
+# dash and zsh don't need the -e switch to echo, bash does
+# maybe there is a better way to detect whether we are running on a bash
+eswitch=""
+if [ "$BASH" ]
+then
+ eswitch="-e"
+fi
+
+# do the work
+if [ $check_accelerators ]
+then
+ for lang in $linguas
+ do
+ msgfmt --check --statistics $check_accelerators po/$lang.po;
+ done
+else
+ for lang in $linguas
+ do
+ # maybe the regexp can be optimized, regexps are not my best friends
+ creationdate=`grep "PO-Revision-Date:" po/$lang.po | sed 's/.*: \([0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}[+|-][0-9]\{4\}\).*/\1/'`
+ echo -n $eswitch $lang"\t("$creationdate"):\t"
+ msgfmt --check --statistics po/$lang.po;
+ done
+fi
+
+
Deleted: trunk/scripts/intl_stats.sh
===================================================================
--- trunk/scripts/intl_stats.sh 2008-04-08 14:20:24 UTC (rev 2454)
+++ trunk/scripts/intl_stats.sh 2008-04-08 14:44:34 UTC (rev 2455)
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# Little shell script to display some basic statistics about Geany's translation
-# files. It also checks the menu accelerators.
-#
-# Copyright 2007-2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
-# Copyright 2007-2008 Frank Lanitz <enrico(dot)troeger(at)uvena(dot)de>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-check_accelerators=""
-linguas=""
-me=`basename $0`
-
-
-usage()
-{
- echo "usage: $me [OPTION] [languages...]"
- echo
- echo "OPTIONs are:"
- echo "-h --help this help screen"
- echo "-a --accelerators check also for menu accelerators"
- echo "languages list of language codes which should be tested"
- echo
- echo "example: $me -a de fr hu"
-}
-
-
-# parse cmd line arguments
-while [ $# -gt 0 ]
-do
- case $1 in
- --accelerators)
- check_accelerators="--check-accelerators=_"
- ;;
- -a)
- check_accelerators="--check-accelerators=_"
- ;;
- --help)
- usage;
- exit 1;
- ;;
- -h)
- usage;
- exit 1;
- ;;
- *)
- linguas="$linguas "$1
- ;;
- esac
- shift
-done
-
-
-
-# if no languages where specified on the command line, take all listed languages in LINGUAS
-if [ -z "$linguas" ]
-then
- linguas=`sed -e '/^#/d' po/LINGUAS`
-fi
-
-# dash and zsh don't need the -e switch to echo, bash does
-# maybe there is a better way to detect whether we are running on a bash
-eswitch=""
-if [ "$BASH" ]
-then
- eswitch="-e"
-fi
-
-# do the work
-if [ $check_accelerators ]
-then
- for lang in $linguas
- do
- msgfmt --check --statistics $check_accelerators po/$lang.po;
- done
-else
- for lang in $linguas
- do
- # maybe the regexp can be optimized, regexps are not my best friends
- creationdate=`grep "PO-Revision-Date:" po/$lang.po | sed 's/.*: \([0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}[+|-][0-9]\{4\}\).*/\1/'`
- echo -n $eswitch $lang"\t("$creationdate"):\t"
- msgfmt --check --statistics po/$lang.po;
- done
-fi
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2454
http://geany.svn.sourceforge.net/geany/?rev=2454&view=rev
Author: eht16
Date: 2008-04-08 07:20:24 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
Backport a bugfix from Scite to fix folding problems.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/editor.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-08 14:07:17 UTC (rev 2453)
+++ trunk/ChangeLog 2008-04-08 14:20:24 UTC (rev 2454)
@@ -3,6 +3,8 @@
* src/document.c, src/document.h, src/main.c, src/project.c:
Add document_new_file_if_non_open() to open new documents if no
other documents are open.
+ * src/editor.c:
+ Backport a bugfix from Scite to fix folding problems.
2008-04-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c 2008-04-08 14:07:17 UTC (rev 2453)
+++ trunk/src/editor.c 2008-04-08 14:20:24 UTC (rev 2454)
@@ -342,7 +342,7 @@
expand(sci, &line, TRUE, FALSE, 0, levelPrev);
}
}
- else if (! (levelNow & SC_FOLDLEVELWHITEFLAG) &&
+ if (! (levelNow & SC_FOLDLEVELWHITEFLAG) &&
((levelPrev & SC_FOLDLEVELNUMBERMASK) > (levelNow & SC_FOLDLEVELNUMBERMASK)))
{
/* See if should still be hidden */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2453
http://geany.svn.sourceforge.net/geany/?rev=2453&view=rev
Author: eht16
Date: 2008-04-08 07:07:17 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
Add document_new_file_if_non_open() to open new documents if no other documents are open.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
trunk/src/document.h
trunk/src/main.c
trunk/src/project.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-07 16:40:55 UTC (rev 2452)
+++ trunk/ChangeLog 2008-04-08 14:07:17 UTC (rev 2453)
@@ -1,3 +1,10 @@
+2008-04-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/document.c, src/document.h, src/main.c, src/project.c:
+ Add document_new_file_if_non_open() to open new documents if no
+ other documents are open.
+
+
2008-04-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* THANKS: Added Dominic Hopf to list of translation supporters.
@@ -7,7 +14,7 @@
* Makefile.am: Fix issue on make dist with intl_stats.sh-script.
* scripts/changelist.pl: Make help output better readable if there are
- not enough arguments given.
+ not enough arguments given.
2008-04-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2008-04-07 16:40:55 UTC (rev 2452)
+++ trunk/src/document.c 2008-04-08 14:07:17 UTC (rev 2453)
@@ -579,6 +579,16 @@
}
+/* Opens a new empty document only if there are no other documents open */
+gint document_new_file_if_non_open()
+{
+ if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0)
+ return document_new_file(NULL, NULL, NULL);
+
+ return -1;
+}
+
+
/**
* Creates a new %document.
* After all, the "document-new" signal is emitted for plugins.
Modified: trunk/src/document.h
===================================================================
--- trunk/src/document.h 2008-04-07 16:40:55 UTC (rev 2452)
+++ trunk/src/document.h 2008-04-08 14:07:17 UTC (rev 2453)
@@ -153,6 +153,8 @@
gboolean document_remove(guint page_num);
+gint document_new_file_if_non_open();
+
gint document_new_file(const gchar *filename, filetype *ft, const gchar *text);
gint document_clone(gint old_idx, const gchar *utf8_filename);
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2008-04-07 16:40:55 UTC (rev 2452)
+++ trunk/src/main.c 2008-04-08 14:07:17 UTC (rev 2453)
@@ -875,8 +875,7 @@
main_status.opening_session_files = FALSE;
/* open a new file if no other file was opened */
- if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0)
- document_new_file(NULL, NULL, NULL);
+ document_new_file_if_non_open();
ui_document_buttons_update();
ui_save_buttons_toggle(FALSE);
Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c 2008-04-07 16:40:55 UTC (rev 2452)
+++ trunk/src/project.c 2008-04-08 14:07:17 UTC (rev 2453)
@@ -217,9 +217,7 @@
{
configuration_open_files();
/* open a new file if no other file was opened */
- /** TODO refactor the following into a function to be used here and in main() */
- if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0)
- document_new_file(NULL, NULL, NULL);
+ document_new_file_if_non_open();
}
}
}
@@ -251,8 +249,7 @@
{
configuration_open_files();
/* open a new file if no other file was opened */
- if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0)
- document_new_file(NULL, NULL, NULL);
+ document_new_file_if_non_open();
}
g_free(file);
}
@@ -343,8 +340,7 @@
configuration_reload_default_session();
configuration_open_files();
/* open a new file if no other file was opened */
- if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) == 0)
- document_new_file(NULL, NULL, NULL);
+ document_new_file_if_non_open();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.