[pkgsrc/trunk]: pkgsrc/wm/obconf Make compile with gcc-2.x.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/656774cf374a
branches:  trunk
changeset: 466281:656774cf374a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jan 14 22:33:28 2004 +0000

description:
Make compile with gcc-2.x.

diffstat:

 wm/obconf/distinfo         |   3 +-
 wm/obconf/patches/patch-aa |  55 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletions(-)

diffs (69 lines):

diff -r 8719cdf547f3 -r 656774cf374a wm/obconf/distinfo
--- a/wm/obconf/distinfo        Wed Jan 14 22:31:27 2004 +0000
+++ b/wm/obconf/distinfo        Wed Jan 14 22:33:28 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/13 21:10:21 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/01/14 22:33:28 wiz Exp $
 
 SHA1 (obconf-1.5.tar.gz) = a82067d5cd79d13df4c1c77e2a281a37fa5de7d2
 Size (obconf-1.5.tar.gz) = 163007 bytes
+SHA1 (patch-aa) = 3aedcfc85c81e075ef07b07d06cb427c5aaf6b53
diff -r 8719cdf547f3 -r 656774cf374a wm/obconf/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/obconf/patches/patch-aa        Wed Jan 14 22:33:28 2004 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-aa,v 1.1 2004/01/14 22:33:28 wiz Exp $
+
+--- src/handlers.c.orig        Sun Sep 28 11:10:25 2003
++++ src/handlers.c
+@@ -45,13 +45,12 @@ void setup_behavior_tab()
+   GtkWidget *edgeresist = glade_xml_get_widget(glade, "resist_edge");
+   GtkSizeGroup *group1  = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ 
+-  gtk_size_group_add_widget(group1, winresist);
+-  gtk_size_group_add_widget(group1, edgeresist);
+-
+   GtkWidget *winresist_l  = glade_xml_get_widget(glade, "resist_window_label");
+   GtkWidget *edgeresist_l = glade_xml_get_widget(glade, "resist_edge_label");
+   GtkSizeGroup *group2    = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ 
++  gtk_size_group_add_widget(group1, winresist);
++  gtk_size_group_add_widget(group1, edgeresist);
+   gtk_size_group_add_widget(group2, winresist_l);
+   gtk_size_group_add_widget(group2, edgeresist_l);
+ }
+@@ -62,13 +61,12 @@ void setup_dock_tab()
+     GtkWidget *dir  = glade_xml_get_widget(glade, "dock_direction");
+     GtkSizeGroup *group1 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ 
+-    gtk_size_group_add_widget(group1, posi);
+-    gtk_size_group_add_widget(group1, dir);
+-
+     GtkWidget *posi_l = glade_xml_get_widget(glade, "dock_position_label");
+     GtkWidget *dir_l  = glade_xml_get_widget(glade, "dock_direction_label");
+     GtkSizeGroup *group2 = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+ 
++    gtk_size_group_add_widget(group1, posi);
++    gtk_size_group_add_widget(group1, dir);
+     gtk_size_group_add_widget(group2, posi_l);
+     gtk_size_group_add_widget(group2, dir_l);
+ }
+@@ -979,14 +977,15 @@ static void on_desktop_names_cell_edited
+                                          const gchar *new_text,
+                                          gpointer data)
+ {
+-    if (mapping) return;
+-
+-    GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
++    GtkTreePath *path;
+     GtkTreeIter it;
+     gchar *old_text;
+     GList *lit;
+     gint i;
+     xmlNodePtr n, c;
++
++    if (mapping) return;
++    path = gtk_tree_path_new_from_string (path_string);
+ 
+     gtk_tree_model_get_iter(GTK_TREE_MODEL(desktop_store), &it, path);
+