Re: 5.4 fails to build, log attached

Date view Thread view Subject view Author view

From: Damon Chaplin (damon@karuna.freeserve.co.uk)
Date: Sun Nov 07 1999 - 13:59:58 EST


Cal Page wrote:
>
> ----------------------------------------------------------------------------------------------------------------------------------------------------------------
> make[3]: Entering directory `/hdc4/src/ftp.gtk.org/glade-0.5.4/glade'
> gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../intl -I../intl -g -O2 -I/usr/X11R6/include -I/usr/local/lib/glib/include -I/usr/local/include -Wall -c property.c
> property.c: In function `create_accelerators_dialog':
> property.c:1454: redeclaration of `button'
> property.c:1444: `button' previously declared here
> property.c:1471: `dialog' undeclared (first use in this function)
> property.c:1471: (Each undeclared identifier is reported only once
> property.c:1471: for each function it appears in.)
> make[3]: *** [property.o] Error 1
> make[3]: Leaving directory `/hdc4/src/ftp.gtk.org/glade-0.5.4/glade'

Damn! I forgot to check the GTK+ version.

This should fix it. I'll do another release in a few days.

--- property.c.orig Tue Sep 28 16:56:03 1999
+++ property.c Sun Nov 7 18:56:27 1999
@@ -1451,12 +1451,14 @@
   gnome_dialog_close_hides (GNOME_DIALOG (accel_dialog), TRUE);
   vbox = GNOME_DIALOG (accel_dialog)->vbox;
 #else
- GtkWidget *buttonbox, *button;
+ GtkWidget *buttonbox;
 
   accel_dialog = gtk_dialog_new ();
+ gtk_container_set_border_width (GTK_CONTAINER (accel_dialog), 8);
   gtk_window_set_title (GTK_WINDOW (accel_dialog), _("Accelerators"));
 
   buttonbox = gtk_hbutton_box_new ();
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonbox), GTK_BUTTONBOX_END);
   gtk_container_add (GTK_CONTAINER (GTK_DIALOG (accel_dialog)->action_area),
                     buttonbox);
   gtk_widget_show (buttonbox);
@@ -1466,9 +1468,10 @@
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
- GTK_SIGNAL_FUNC (glade_util_close_window), NULL);
- gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
+ gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+ GTK_SIGNAL_FUNC (glade_util_close_window),
+ GTK_OBJECT (accel_dialog));
+ gtk_signal_connect (GTK_OBJECT (accel_dialog), "delete_event",
                      GTK_SIGNAL_FUNC (glade_util_close_window_on_delete),
                      NULL);
   vbox = GTK_DIALOG (accel_dialog)->vbox;

Damon

+---------------------------------------------------------------------+
To unsubscribe from this list, send a message to majordomo@ncis.pn.org
with the line "unsubscribe glade-devel" in the body of the message.


Date view Thread view Subject view Author view

This archive was generated by hypermail 2b29 : Tue Aug 01 2000 - 19:25:33 EDT