rm -rf intl breaks --disable-nls, put it back

* autogen.sh: rm -rf intl breaks --disable-nls, put it back

* gtkbutton.[ch]
* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
Digital: 1 GTK+: 0 (for now)

-Yosh

11 files changed, 71 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 334e9c3a1..49bdbdfd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec 16 21:20:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* autogen.sh: rm -rf intl breaks --disable-nls, put it back
+
+	* gtkbutton.[ch]
+	* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
+	Digital: 1 GTK+: 0 (for now)
+
 Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gdk/gdkevents.c: updated call to g_main_add_poll
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 334e9c3a1..49bdbdfd5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Wed Dec 16 21:20:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* autogen.sh: rm -rf intl breaks --disable-nls, put it back
+
+	* gtkbutton.[ch]
+	* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
+	Digital: 1 GTK+: 0 (for now)
+
 Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gdk/gdkevents.c: updated call to g_main_add_poll
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 334e9c3a1..49bdbdfd5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed Dec 16 21:20:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* autogen.sh: rm -rf intl breaks --disable-nls, put it back
+
+	* gtkbutton.[ch]
+	* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
+	Digital: 1 GTK+: 0 (for now)
+
 Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gdk/gdkevents.c: updated call to g_main_add_poll
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 334e9c3a1..49bdbdfd5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed Dec 16 21:20:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* autogen.sh: rm -rf intl breaks --disable-nls, put it back
+
+	* gtkbutton.[ch]
+	* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
+	Digital: 1 GTK+: 0 (for now)
+
 Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gdk/gdkevents.c: updated call to g_main_add_poll
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 334e9c3a1..49bdbdfd5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed Dec 16 21:20:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* autogen.sh: rm -rf intl breaks --disable-nls, put it back
+
+	* gtkbutton.[ch]
+	* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
+	Digital: 1 GTK+: 0 (for now)
+
 Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gdk/gdkevents.c: updated call to g_main_add_poll
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 334e9c3a1..49bdbdfd5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed Dec 16 21:20:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* autogen.sh: rm -rf intl breaks --disable-nls, put it back
+
+	* gtkbutton.[ch]
+	* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
+	Digital: 1 GTK+: 0 (for now)
+
 Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gdk/gdkevents.c: updated call to g_main_add_poll
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 334e9c3a1..49bdbdfd5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed Dec 16 21:20:00 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* autogen.sh: rm -rf intl breaks --disable-nls, put it back
+
+	* gtkbutton.[ch]
+	* gtktogglebutton.c: s/(enter|leave)/$1_button/g.
+	Digital: 1 GTK+: 0 (for now)
+
 Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 
 	* gdk/gdkevents.c: updated call to g_main_add_poll
diff --git a/autogen.sh b/autogen.sh
index 35a163264..6a8d3b0fe 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -79,9 +79,6 @@ echo "Running gettextize...  Ignore non-fatal messages."
 # while making dist.
 echo "no" | gettextize --copy --force
 
-# We don't need ./intl
-rm -rf intl
-
 aclocal $ACLOCAL_FLAGS
 
 # optionally feature autoheader
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 28e2a57bb..a833df6fc 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -160,14 +160,14 @@ gtk_button_class_init (GtkButtonClass *klass)
     gtk_signal_new ("enter",
                     GTK_RUN_FIRST,
                     object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkButtonClass, enter),
+                    GTK_SIGNAL_OFFSET (GtkButtonClass, enter_button),
                     gtk_marshal_NONE__NONE,
 		    GTK_TYPE_NONE, 0);
   button_signals[LEAVE] =
     gtk_signal_new ("leave",
                     GTK_RUN_FIRST,
                     object_class->type,
-                    GTK_SIGNAL_OFFSET (GtkButtonClass, leave),
+                    GTK_SIGNAL_OFFSET (GtkButtonClass, leave_button),
                     gtk_marshal_NONE__NONE,
 		    GTK_TYPE_NONE, 0);
 
@@ -198,8 +198,8 @@ gtk_button_class_init (GtkButtonClass *klass)
   klass->pressed = gtk_real_button_pressed;
   klass->released = gtk_real_button_released;
   klass->clicked = NULL;
-  klass->enter = gtk_real_button_enter;
-  klass->leave = gtk_real_button_leave;
+  klass->enter_button = gtk_real_button_enter;
+  klass->leave_button = gtk_real_button_leave;
 }
 
 static void
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 8b2fbf673..b6d901a75 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -56,11 +56,15 @@ struct _GtkButtonClass
 {
   GtkBinClass        parent_class;
   
-  void (* pressed)  (GtkButton *button);
-  void (* released) (GtkButton *button);
-  void (* clicked)  (GtkButton *button);
-  void (* enter)    (GtkButton *button);
-  void (* leave)    (GtkButton *button);
+  void (* pressed)      (GtkButton *button);
+  void (* released)     (GtkButton *button);
+  void (* clicked)      (GtkButton *button);
+
+  /* these used to be enter and leave, but Digital decided they were more
+     important than us. They may have beaten us for now, but revenge is
+     a dish best served cold */
+  void (* enter_button) (GtkButton *button);
+  void (* leave_button) (GtkButton *button);
 };
 
 
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 8b6fd6a88..3998680ad 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -129,8 +129,8 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
   button_class->pressed = gtk_toggle_button_pressed;
   button_class->released = gtk_toggle_button_released;
   button_class->clicked = gtk_toggle_button_clicked;
-  button_class->enter = gtk_toggle_button_enter;
-  button_class->leave = gtk_toggle_button_leave;
+  button_class->enter_button = gtk_toggle_button_enter;
+  button_class->leave_button = gtk_toggle_button_leave;
 
   class->toggled = NULL;
 }