anjuta/abuild.patch

123 lines
3.9 KiB
Diff

Index: anjuta-2.2.2/libegg/eggtreemodelfilter.c
===================================================================
--- anjuta-2.2.2.orig/libegg/eggtreemodelfilter.c
+++ anjuta-2.2.2/libegg/eggtreemodelfilter.c
@@ -668,6 +668,7 @@ egg_tree_model_filter_fetch_child (EggTr
gint *index)
{
gint i = 0;
+ gint i_t;
gint start, middle, end;
gint len;
GtkTreePath *c_path = NULL;
@@ -756,7 +757,8 @@ egg_tree_model_filter_fetch_child (EggTr
g_array_insert_val (level->array, i, elt);
*index = i;
- for (i = MAX (--i, 0); i < level->array->len; i++)
+ i_t = i - 1;
+ for (i = MAX (i_t, 0); i < level->array->len; i++)
{
FilterElt *e = &(g_array_index (level->array, FilterElt, i));
if (e->children)
@@ -830,9 +832,11 @@ egg_tree_model_filter_remove_node (EggTr
if (tmp)
{
+ gint i_t;
g_array_remove_index (level->array, i);
- for (i = MAX (--i, 0); i < level->array->len; i++)
+ i_t = i - 1;
+ for (i = MAX (i_t, 0); i < level->array->len; i++)
{
/* NOTE: here we do *not* decrease offsets, because the node was
* not removed from the child model
@@ -1509,6 +1513,7 @@ egg_tree_model_filter_row_deleted (GtkTr
else
{
FilterElt *tmp;
+ gint i_t;
/* remove the row */
tmp = bsearch_elt_with_offset (level->array, elt->offset, &i);
@@ -1516,7 +1521,8 @@ egg_tree_model_filter_row_deleted (GtkTr
offset = tmp->offset;
g_array_remove_index (level->array, i);
- for (i = MAX (--i, 0); i < level->array->len; i++)
+ i_t = i = 1;
+ for (i = MAX (i_t, 0); i < level->array->len; i++)
{
elt = &g_array_index (level->array, FilterElt, i);
if (elt->offset > offset)
Index: anjuta-2.2.2/libegg/test-tree-utils.c
===================================================================
--- anjuta-2.2.2.orig/libegg/test-tree-utils.c
+++ anjuta-2.2.2/libegg/test-tree-utils.c
@@ -217,7 +217,9 @@ key_test (void)
gtk_container_add (GTK_CONTAINER (sw), tv);
column = gtk_tree_view_column_new ();
rend = egg_cell_renderer_keys_new ();
- g_object_set (G_OBJECT (rend), "accel_mode", EGG_CELL_RENDERER_KEYS_MODE_X);
+ g_object_set (G_OBJECT (rend),
+ "accel_mode", EGG_CELL_RENDERER_KEYS_MODE_X,
+ NULL);
g_signal_connect (G_OBJECT (rend),
"keys_edited",
G_CALLBACK (accel_edited_callback),
Index: anjuta-2.2.2/plugins/profiler/gprof-call-graph-view.c
===================================================================
--- anjuta-2.2.2.orig/plugins/profiler/gprof-call-graph-view.c
+++ anjuta-2.2.2/plugins/profiler/gprof-call-graph-view.c
@@ -21,6 +21,13 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
#include "gprof-call-graph-view.h"
struct _GProfCallGraphViewPriv
Index: anjuta-2.2.2/plugins/profiler/gprof-flat-profile-view.c
===================================================================
--- anjuta-2.2.2.orig/plugins/profiler/gprof-flat-profile-view.c
+++ anjuta-2.2.2/plugins/profiler/gprof-flat-profile-view.c
@@ -21,6 +21,13 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
#include "gprof-flat-profile-view.h"
struct _GProfFlatProfileViewPriv
Index: anjuta-2.2.2/plugins/profiler/gprof-function-call-tree-view.c
===================================================================
--- anjuta-2.2.2.orig/plugins/profiler/gprof-function-call-tree-view.c
+++ anjuta-2.2.2/plugins/profiler/gprof-function-call-tree-view.c
@@ -21,6 +21,13 @@
* Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <glib.h>
+#include <glib/gi18n.h>
+
#include "gprof-function-call-tree-view.h"
struct _GProfFunctionCallTreeViewPriv