Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 20 Jan 2015 18:33:06 UTC
Commit: ac76c84fdcf0f9bc2551ec4453df316531c81a9a
https://github.com/geany/geany/commit/ac76c84fdcf0f9bc2551ec4453df316531c81…
Log Message:
-----------
Use Safari as the default browser on OS X
Since Safari isn't on PATH, the open command has to be used
Modified Paths:
--------------
src/keyfile.c
Modified: src/keyfile.c
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -77,7 +77,11 @@
#else
#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm -e \"/bin/sh %c\""
#endif
+#ifdef __APPLE__
+#define GEANY_DEFAULT_TOOLS_BROWSER "open -a safari"
+#else
#define GEANY_DEFAULT_TOOLS_BROWSER "firefox"
+#endif
#define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr"
#define GEANY_DEFAULT_TOOLS_GREP "grep"
#define GEANY_DEFAULT_MRU_LENGTH 10
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 20 Jan 2015 18:33:06 UTC
Commit: 9767f79e50408911508577cb68906658872afe3b
https://github.com/geany/geany/commit/9767f79e50408911508577cb68906658872af…
Log Message:
-----------
Improve ui_get_mime_icon()
It may happen that even though we get GIcon, the actual icon
dosen't exist (typically on Windows and OS X). Check if we
can find the actual icon.
In addition, use "icon name" instead of "stock id" - the latter
doesn't work on OS X / Windows for some reason.
Modified Paths:
--------------
src/ui_utils.c
Modified: src/ui_utils.c
20 lines changed, 17 insertions(+), 3 deletions(-)
===================================================================
@@ -2893,18 +2893,32 @@ GIcon *ui_get_mime_icon(const gchar *mime_type)
if (ctype)
{
icon = g_content_type_get_icon(ctype);
+ if (icon)
+ {
+ GtkIconInfo *icon_info;
+
+ icon_info = gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(), icon, 16, 0);
+ if (!icon_info)
+ {
+ g_object_unref(icon);
+ icon = NULL;
+ }
+ else
+ gtk_icon_info_free(icon_info);
+ }
+
g_free(ctype);
}
/* fallback if icon lookup failed, like it might happen on Windows (?) */
if (! icon)
{
- const gchar *stock_id = GTK_STOCK_FILE;
+ const gchar *icon_name = "text-x-generic";
if (strstr(mime_type, "directory"))
- stock_id = GTK_STOCK_DIRECTORY;
+ icon_name = "folder";
- icon = g_themed_icon_new(stock_id);
+ icon = g_themed_icon_new(icon_name);
}
return icon;
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 20 Jan 2015 18:33:06 UTC
Commit: 3c01fae8d95f51340e16247f51d0e654500d43f5
https://github.com/geany/geany/commit/3c01fae8d95f51340e16247f51d0e654500d4…
Log Message:
-----------
Disable scintilla buffer draw on OS X (with Quartz backend)
This delagates font rendering to Quartz so it can be rendered
in 2x resolution on "retina" displays.
Modified Paths:
--------------
src/editor.c
Modified: src/editor.c
5 lines changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -4779,6 +4779,11 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor)
/* virtual space */
SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0);
+
+#ifdef GDK_WINDOWING_QUARTZ
+ /* "retina" (HiDPI) display support on OS X - requires disabling buffered draw */
+ SSM(sci, SCI_SETBUFFEREDDRAW, 0, 0);
+#endif
/* only connect signals if this is for the document notebook, not split window */
if (editor->sci == NULL)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 20 Jan 2015 18:33:06 UTC
Commit: 5356c4549ace052b2e3be5451c9c6410ab3d9e41
https://github.com/geany/geany/commit/5356c4549ace052b2e3be5451c9c6410ab3d9…
Log Message:
-----------
Fix infinite loop on OS X when using find in files
The GIOCondition is always set to G_IO_IN even when input end
is reached (and no other flags are set) so the read_fif_io()
function never returns FALSE which causes an infinite loop.
It is necessary to check also the return value of
g_io_channel_read_line() and return FALSE on EOF or error.
Modified Paths:
--------------
src/search.c
Modified: src/search.c
6 lines changed, 5 insertions(+), 1 deletions(-)
===================================================================
@@ -1841,8 +1841,10 @@ static gboolean read_fif_io(GIOChannel *source, GIOCondition condition, gchar *e
if (condition & (G_IO_IN | G_IO_PRI))
{
gchar *msg, *utf8_msg;
+ GIOStatus st;
- while (g_io_channel_read_line(source, &msg, NULL, NULL, NULL) && msg)
+ while ((st = g_io_channel_read_line(source, &msg, NULL, NULL, NULL)) != G_IO_STATUS_ERROR &&
+ st != G_IO_STATUS_EOF && msg)
{
utf8_msg = NULL;
@@ -1866,6 +1868,8 @@ static gboolean read_fif_io(GIOChannel *source, GIOCondition condition, gchar *e
g_free(utf8_msg);
g_free(msg);
}
+ if (st == G_IO_STATUS_ERROR || st == G_IO_STATUS_EOF)
+ return FALSE;
}
if (condition & (G_IO_ERR | G_IO_HUP | G_IO_NVAL))
return FALSE;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 10 Feb 2015 14:57:50 UTC
Commit: 6a132ef3fa4a01f7e05a0b8d673407429e3e6c8a
https://github.com/geany/geany/commit/6a132ef3fa4a01f7e05a0b8d673407429e3e6…
Log Message:
-----------
CR line endings are used on old Mac OS systems only - make it more explicit in labels
Also don't default to CR if OS is neither Windows nor Unix (including OS X).
There's no other GTK backend right now so it doesn't matter much but
still if something else appears, it will most probably not have CR line
endings.
Modified Paths:
--------------
data/geany.glade
src/document.h
src/utils.c
Modified: data/geany.glade
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -7726,7 +7726,7 @@
<object class="GtkRadioMenuItem" id="cr">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Convert and Set to CR (_Mac)</property>
+ <property name="label" translatable="yes">Convert and Set to CR (Classic _Mac)</property>
<property name="use_underline">True</property>
<property name="group">crlf</property>
<signal name="activate" handler="on_cr_activate" swapped="no"/>
Modified: src/document.h
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -222,10 +222,8 @@ GeanyDocument *document_find_by_id(guint id);
#if defined(G_OS_WIN32)
# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CRLF
-#elif defined(G_OS_UNIX)
-# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_LF
#else
-# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_CR
+# define GEANY_DEFAULT_EOL_CHARACTER SC_EOL_LF
#endif
extern GeanyFilePrefs file_prefs;
Modified: src/utils.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -374,7 +374,7 @@ const gchar *utils_get_eol_name(gint eol_mode)
switch (eol_mode)
{
case SC_EOL_CRLF: return _("Win (CRLF)"); break;
- case SC_EOL_CR: return _("Mac (CR)"); break;
+ case SC_EOL_CR: return _("Classic Mac (CR)"); break;
default: return _("Unix (LF)"); break;
}
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).