[geany/geany-plugins] 8968f7: geanyinsertnum - fixed compilation with Geany >= 2013-03-11 && gtk <= 2.22 - Plugins-Commits

10 Apr 2013


      Branch:      refs/heads/master
Author:      Dimitar Zhekov dimitar.zhekov@gmail.com
Committer:   Dimitar Zhekov dimitar.zhekov@gmail.com
Date:        Wed, 10 Apr 2013 17:10:34 UTC
Commit:      8968f7a3cab5f309ba870132c7e31b0e94b02fcd
             https://github.com/geany/geany-plugins/commit/8968f7a3cab5f309ba870132c7e31b...
Log Message:
-----------
geanyinsertnum - fixed compilation with Geany >= 2013-03-11 && gtk <= 2.22
Modified Paths:
--------------
    geanyinsertnum/ChangeLog
    geanyinsertnum/src/insertnum.c
Modified: geanyinsertnum/ChangeLog
7 files changed, 7 insertions(+), 0 deletions(-)
===================================================================
@@ -1,6 +1,13 @@
 2013-04-06  Dimitar Zhekov  dimitar.zhekov@gmail.com
* src/insertnum.c:
+   Undefined GTK_COMPAT_H and fixed compilation with
+   Geany >= 2013-03-11 && gtk+ <= 2.22. Let's hope it won't
+   break anything.
+
+2013-04-06  Dimitar Zhekov  dimitar.zhekov@gmail.com
+
+ * src/insertnum.c:
    Fixed some space indentation.
    Changes to use GtkGrid under GTK+ 3.
    Defined GTK_COMPAT_H to avoid inclusion of gtkcompat.h and
Modified: geanyinsertnum/src/insertnum.c
15 files changed, 7 insertions(+), 8 deletions(-)
===================================================================
@@ -26,9 +26,15 @@
 #include <stdlib.h>
 #include <string.h>
-#define GTK_COMPAT_H
 #include "geanyplugin.h"
+#ifndef GTK_COMPAT_H
+#define GtkComboBoxText GtkComboBox
+#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
+#define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text
+#define gtk_combo_box_text_append_text gtk_combo_box_append_text
+#endif
+
 GeanyPlugin	*geany_plugin;
 GeanyData	*geany_data;
 GeanyFunctions	*geany_functions;
@@ -309,13 +315,6 @@ static void set_entry(GtkWidget *entry, gint maxlen, GtkWidget *label, const gch
    ui_widget_set_tooltip_text(entry, tooltip);
 }
-#if !GTK_CHECK_VERSION(2, 24, 0)
-#define GtkComboBoxText GtkComboBox
-#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
-#define gtk_combo_box_text_new_with_entry gtk_combo_box_entry_new_text
-#define gtk_combo_box_text_append_text gtk_combo_box_append_text
-#endif
-
 #if !GTK_CHECK_VERSION(3, 0, 0)
 #define GtkGrid GtkTable
 #define GTK_GRID GTK_TABLE
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    