Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 09 Oct 2012 11:25:12 UTC
Commit: 1f244e0d54fb544caa8250a2efa634d24d0f4f15
https://github.com/geany/geany/commit/1f244e0d54fb544caa8250a2efa634d24d0f4…
Log Message:
-----------
Set the primary-toolbar CSS class on the main toolbar under GTK3
This makes the main toolbar look like other GTK3 application ones.
Modified Paths:
--------------
src/toolbar.c
Modified: src/toolbar.c
3 files changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -395,6 +395,9 @@ GtkWidget *toolbar_init(void)
gtk_ui_manager_insert_action_group(uim, group, 0);
toolbar = toolbar_reload(NULL);
+#if GTK_CHECK_VERSION(3, 0, 0)
+ gtk_style_context_add_class(gtk_widget_get_style_context(toolbar), "primary-toolbar");
+#endif
gtk_settings = gtk_widget_get_settings(GTK_WIDGET(toolbar));
if (gtk_settings != NULL)
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 09 Oct 2012 11:25:12 UTC
Commit: caf207c36a54814b57b83ca69ec007eaa7bb6f13
https://github.com/geany/geany/commit/caf207c36a54814b57b83ca69ec007eaa7bb6…
Log Message:
-----------
Don't use old GTK1-style typesystem
This fixes the SCINTILLA_CLASS() and IS_SCINTILLA() macros on GTK3.
No harm on GTK2, those macros are available since 2.0.
This also makes those macros more consistent with the SCINTILLA()
macro that already uses the proper GObject calls.
Backported from Scintilla HG: 9cd7cf1d9af73d50b0423ed34a6693bbf7f57ac8
Modified Paths:
--------------
scintilla/include/ScintillaWidget.h
Modified: scintilla/include/ScintillaWidget.h
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -16,8 +16,8 @@
#endif
#define SCINTILLA(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, scintilla_get_type (), ScintillaObject)
-#define SCINTILLA_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
-#define IS_SCINTILLA(obj) GTK_CHECK_TYPE (obj, scintilla_get_type ())
+#define SCINTILLA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, scintilla_get_type (), ScintillaClass)
+#define IS_SCINTILLA(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, scintilla_get_type ())
typedef struct _ScintillaObject ScintillaObject;
typedef struct _ScintillaClass ScintillaClass;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Tue, 09 Oct 2012 11:24:42 UTC
Commit: 6c942c1436fa91c715cc90ce0d046627e75e3306
https://github.com/geany/geany/commit/6c942c1436fa91c715cc90ce0d046627e75e3…
Log Message:
-----------
Prevent plugins built against GTK2 Geany from loading in GTK3 Geany
Modified Paths:
--------------
src/plugindata.h
Modified: src/plugindata.h
9 files changed, 8 insertions(+), 1 deletions(-)
===================================================================
@@ -57,12 +57,19 @@
*/
#define GEANY_API_VERSION 216
+/* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins
+ * with GTK3-linked Geany leads to crash */
+#if GTK_CHECK_VERSION(3, 0, 0)
+# define GEANY_ABI_SHIFT 8
+#else
+# define GEANY_ABI_SHIFT 0
+#endif
/** The Application Binary Interface (ABI) version, incremented whenever
* existing fields in the plugin data types have to be changed or reordered.
* Changing this forces all plugins to be recompiled before Geany can load them. */
/* This should usually stay the same if fields are only appended, assuming only pointers to
* structs and not structs themselves are declared by plugins. */
-#define GEANY_ABI_VERSION 69
+#define GEANY_ABI_VERSION (69 << GEANY_ABI_SHIFT)
/** Defines a function to check the plugin is safe to load.
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Mon, 08 Oct 2012 18:08:07 UTC
Commit: 3ae884c13f0eddd5a8533fefddda8a566196ad24
https://github.com/geany/geany/commit/3ae884c13f0eddd5a8533fefddda8a566196a…
Log Message:
-----------
Make X11 backend specific code GTK3-proof
Modified Paths:
--------------
src/socket.c
Modified: src/socket.c
10 files changed, 8 insertions(+), 2 deletions(-)
===================================================================
@@ -663,12 +663,18 @@ gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpoint
if (popup)
{
#ifdef GDK_WINDOWING_X11
+ GdkWindow *x11_window = gtk_widget_get_window(window);
+
/* Set the proper interaction time on the window. This seems necessary to make
* gtk_window_present() really bring the main window into the foreground on some
* window managers like Gnome's metacity.
* Code taken from Gedit. */
- gdk_x11_window_set_user_time(gtk_widget_get_window(window),
- gdk_x11_get_server_time(gtk_widget_get_window(window)));
+# if GTK_CHECK_VERSION(3, 0, 0)
+ if (GDK_IS_X11_WINDOW(x11_window))
+# endif
+ {
+ gdk_x11_window_set_user_time(x11_window, gdk_x11_get_server_time(x11_window));
+ }
#endif
gtk_window_present(GTK_WINDOW(window));
#ifdef G_OS_WIN32
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).