[geany/geany-plugins] 01ed13: scope - enable array element size emulation for glib < 2.22, not < 2.20

[Dimitar Zhekov]

Branch:      refs/heads/master
Author:      Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer:   Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date:        Tue, 29 Jan 2013 19:50:53 UTC
Commit:      01ed13af57dff9f2211cd7508206cac530c03364
             https://github.com/geany/geany-plugins/commit/01ed13af57dff9f2211cd7508206cac530c03364

Log Message:
-----------
scope - enable array element size emulation for glib < 2.22, not < 2.20


Modified Paths:
--------------
    scope/ChangeLog
    scope/src/gtk216.c
    scope/src/gtk216.h

Modified: scope/ChangeLog
7 files changed, 7 insertions(+), 0 deletions(-)
===================================================================
@@ -1,3 +1,10 @@
+2013-01-29  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
+
+ * src/gtk216.c, src/gtk216.h:
+   Enable g_array_get_element_size() emulation for glib < 2.22 instead
+   of glib < 2.20.
+
+
 2013-01-22  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
 
  * src/debug.c:


Modified: scope/src/gtk216.c
8 files changed, 4 insertions(+), 4 deletions(-)
===================================================================
@@ -19,7 +19,7 @@
 
 #include "common.h"
 
-#if !GLIB_CHECK_VERSION(2, 20, 0)
+#if !GLIB_CHECK_VERSION(2, 22, 0)
 /* :-( */
 typedef struct _ArraySize
 {
@@ -65,7 +65,7 @@ gchar *scope_array_free(GArray *array, gboolean free_segment)
 
 	return g_array_free(array, free_segment);
 }
-#endif  /* GLIB 2.20.0 */
+#endif  /* GLIB 2.22.0 */
 
 #if !GTK_CHECK_VERSION(2, 18, 0)
 void gtk_widget_set_visible(GtkWidget *widget, gboolean visible)
@@ -124,14 +124,14 @@ void gtk216_init(void)
 	for (scd = sort_column_ids; scd->id; scd++)
 		gtk_tree_view_column_set_sort_column_id(get_column(scd->id), scd->sort_column_id);
 
-#if !GLIB_CHECK_VERSION(2, 20, 0)
+#if !GLIB_CHECK_VERSION(2, 22, 0)
 	array_sizes = g_array_sized_new(FALSE, FALSE, sizeof(ArraySize), 0x10);
 #endif
 }
 
 void gtk216_finalize(void)
 {
-#if !GLIB_CHECK_VERSION(2, 20, 0)
+#if !GLIB_CHECK_VERSION(2, 22, 0)
 	g_array_free(array_sizes, TRUE);
 #endif
 }


Modified: scope/src/gtk216.h
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -19,7 +19,7 @@
 
 #ifndef GTK216_H
 
-#if !GLIB_CHECK_VERSION(2, 20, 0)
+#if !GLIB_CHECK_VERSION(2, 22, 0)
 GArray *scope_array_sized_new(gboolean zero_terminated, gboolean clear, guint element_size,
 	guint reserved_size);
 #define g_array_sized_new(zero_terminated, clear, element_size, reserved_size) \
@@ -30,7 +30,7 @@ GArray *scope_array_sized_new(gboolean zero_terminated, gboolean clear, guint el
 #define g_array_get_element_size(array) scope_array_get_element_size(array)
 gchar *scope_array_free(GArray *array, gboolean free_segment);
 #define g_array_free(array, free_segment) scope_array_free((array), (free_segment))
-#endif  /* GLIB 2.20.0 */
+#endif  /* GLIB 2.22.0 */
 
 #if !GTK_CHECK_VERSION(2, 18, 0)
 #define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE(widget)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).