Revision: 5852
http://geany.svn.sourceforge.net/geany/?rev=5852&view=rev
Author: colombanw
Date: 2011-06-17 22:51:17 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Remove most of the checks for GIO
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
trunk/src/main.c
trunk/src/ui_utils.c
trunk/src/utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/ChangeLog 2011-06-17 22:51:17 UTC (rev 5852)
@@ -1,3 +1,9 @@
+2011-06-16 Colomban Wendling <colomban(at)geany(dot)org>
+
+ * src/document.c, src/main.c, src/ui_utils.c, src/utils.c:
+ Remove most of the checks for GIO.
+
+
2011-06-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* tagmanager/python.c:
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/document.c 2011-06-17 22:51:17 UTC (rev 5852)
@@ -48,13 +48,7 @@
/* uncomment to use GIO based file monitoring, though it is not completely stable yet */
/*#define USE_GIO_FILEMON 1*/
-#ifdef HAVE_GIO
-# include <gio/gio.h>
-#else
-# if USE_GIO_FILEMON
-# undef USE_GIO_FILEMON
-# endif
-#endif
+#include <gio/gio.h>
#include "document.h"
#include "documentprivate.h"
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/main.c 2011-06-17 22:51:17 UTC (rev 5852)
@@ -96,9 +96,6 @@
static const gchar geany_lib_versions[] = "GTK %u.%u.%u, GLib %u.%u.%u"
-#ifdef HAVE_GIO
- ", GIO"
-#endif
#ifdef USE_INCLUDED_REGEX
", built-in regex"
#endif
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/ui_utils.c 2011-06-17 22:51:17 UTC (rev 5852)
@@ -2517,7 +2517,7 @@
GdkPixbuf *ui_get_mime_icon(const gchar *mime_type, GtkIconSize size)
{
GdkPixbuf *icon = NULL;
-#if defined(HAVE_GIO) && GLIB_CHECK_VERSION(2, 18, 0)
+#if GLIB_CHECK_VERSION(2, 18, 0)
gchar *ctype;
GIcon *gicon;
GtkIconInfo *info;
@@ -2544,7 +2544,7 @@
}
}
#endif
- /* fallback for builds without GIO or if icon lookup failed, like it might happen on Windows */
+ /* fallback for builds with GIO < 2.18 or if icon lookup failed, like it might happen on Windows */
if (icon == NULL)
{
const gchar *stock_id = GTK_STOCK_FILE;
Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c 2011-06-15 21:01:23 UTC (rev 5851)
+++ trunk/src/utils.c 2011-06-17 22:51:17 UTC (rev 5852)
@@ -44,9 +44,7 @@
#include <glib/gstdio.h>
-#ifdef HAVE_GIO
-# include <gio/gio.h>
-#endif
+#include <gio/gio.h>
#include "prefs.h"
#include "support.h"
@@ -1838,7 +1836,6 @@
/* this will work only for 'file://' URIs */
locale_filename = g_filename_from_uri(uri, NULL, NULL);
-#ifdef HAVE_GIO
/* g_filename_from_uri() failed, so we probably have a non-local URI */
if (locale_filename == NULL)
{
@@ -1849,13 +1846,8 @@
{
geany_debug("The URI '%s' could not be resolved to a local path. This means "
"that the URI is invalid or that you don't have gvfs-fuse installed.", uri);
- return NULL;
}
}
-#endif
- if (locale_filename == NULL)
- geany_debug("The URI '%s' could not be resolved to a local path. This means that the "
- "URI is invalid or that Geany can't use GVFS (maybe it is not installed).", uri);
return locale_filename;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 5850
http://geany.svn.sourceforge.net/geany/?rev=5850&view=rev
Author: eht16
Date: 2011-06-14 21:23:19 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Add Cython keywords
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/filetypes.python
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-06-13 23:03:50 UTC (rev 5849)
+++ trunk/ChangeLog 2011-06-14 21:23:19 UTC (rev 5850)
@@ -1,3 +1,9 @@
+2011-06-14 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * data/filetypes.python:
+ Add Cython keywords.
+
+
2011-06-13 Colomban Wendling <colomban(at)geany(dot)org>
* configure.ac, src/Makefile.am, src/makefile.win32, wscript:
Modified: trunk/data/filetypes.python
===================================================================
--- trunk/data/filetypes.python 2011-06-13 23:03:50 UTC (rev 5849)
+++ trunk/data/filetypes.python 2011-06-14 21:23:19 UTC (rev 5850)
@@ -21,7 +21,7 @@
[keywords]
# all items must be in one line
-primary=and as assert break class continue def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
+primary=and as assert break cdef cimport class continue cpdef def del elif else except exec finally for from global if import in is lambda not or pass print raise return try while with yield False None True
# additional keywords, will be highlighted with style "word2"
# these are the builtins for Python 2.5 created with ' '.join(dir(__builtins__))
identifiers=ArithmeticError AssertionError AttributeError BaseException BufferError BytesWarning DeprecationWarning EOFError Ellipsis EnvironmentError Exception False FloatingPointError FutureWarning GeneratorExit IOError ImportError ImportWarning IndentationError IndexError KeyError KeyboardInterrupt LookupError MemoryError NameError None NotImplemented NotImplementedError OSError OverflowError PendingDeprecationWarning ReferenceError RuntimeError RuntimeWarning StandardError StopIteration SyntaxError SyntaxWarning SystemError SystemExit TabError True TypeError UnboundLocalError UnicodeDecodeError UnicodeEncodeError UnicodeError UnicodeTranslateError UnicodeWarning UserWarning ValueError Warning ZeroDivisionError __debug__ __doc__ __import__ __name__ __package__ abs all any apply basestring bin bool buffer bytearray bytes callable chr classmethod cmp coerce compile complex copyright credits delattr dict dir divmod enumerate eval execfile exit file filter float format frozenset getattr globals hasattr hash help hex id input int intern isinstance issubclass iter len license list locals long map max min next object oct open ord pow print property quit range raw_input reduce reload repr reversed round set setattr slice sorted staticmethod str sum super tuple type unichr unicode vars xrange zip
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.