From d21198eb612a0cd52bb8cc52f140ec95310c9edf Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Tue, 1 Dec 1998 05:13:40 +0000 Subject: [PATCH] s/gtk_container_border_width_/gtk_container_set_border_width/ Remove OBJ_DIR junk from autogen.sh. --- autogen.sh | 8 +------- gnome/gpageprop.c | 2 +- gnome/gprop.c | 10 +++++----- gnome/gscreen.c | 4 ++-- gnome/gtools.c | 2 +- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/autogen.sh b/autogen.sh index 52c8074ac..71c24461b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,10 +16,4 @@ autoheader autoconf ) -if [ -z "$OBJ_DIR" ]; then - $srcdir/configure --enable-maintainer-mode $* -else - mkdir -p "$OBJ_DIR" - cd "$OBJ_DIR" - ../configure --enable-maintainer-mode $* -fi +$srcdir/configure --enable-maintainer-mode $* diff --git a/gnome/gpageprop.c b/gnome/gpageprop.c index ab35b147e..b3aebc3cd 100644 --- a/gnome/gpageprop.c +++ b/gnome/gpageprop.c @@ -28,7 +28,7 @@ static int prop_dialog_result; static GtkWidget * c_spacing (GtkWidget *widget) { - gtk_container_border_width (GTK_CONTAINER (widget), 6); + gtk_container_set_border_width (GTK_CONTAINER (widget), 6); return widget; } diff --git a/gnome/gprop.c b/gnome/gprop.c index 31566655f..b9aea034a 100644 --- a/gnome/gprop.c +++ b/gnome/gprop.c @@ -60,7 +60,7 @@ gprop_filename_new (char *complete_filename, char *filename) gtk_widget_show (frame); vbox = gtk_vbox_new (FALSE, 6); - gtk_container_border_width (GTK_CONTAINER (vbox), 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); @@ -111,7 +111,7 @@ gprop_exec_new (GnomeDesktopEntry *dentry) gtk_widget_show (frame); table = gtk_table_new (0, 0, 0); - gtk_container_border_width (GTK_CONTAINER (table), 6); + gtk_container_set_border_width (GTK_CONTAINER (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_add (GTK_CONTAINER (frame), table); @@ -248,7 +248,7 @@ perm_mode_new (GpropPerm *gp, umode_t umode) frame = gtk_frame_new (_("File mode (permissions)")); vbox = gtk_vbox_new (FALSE, 4); - gtk_container_border_width (GTK_CONTAINER (vbox), 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); @@ -379,7 +379,7 @@ perm_ownership_new (GpropPerm *gp, char *owner, char *group) frame = gtk_frame_new ("File ownership"); table = gtk_table_new (2, 2, FALSE); - gtk_container_border_width (GTK_CONTAINER (table), 6); + gtk_container_set_border_width (GTK_CONTAINER (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 4); gtk_container_add (GTK_CONTAINER (frame), table); @@ -497,7 +497,7 @@ gprop_general_new (char *title, char *icon_filename) gtk_widget_show (frame); table = gtk_table_new (3, 2, FALSE); - gtk_container_border_width (GTK_CONTAINER (table), 6); + gtk_container_set_border_width (GTK_CONTAINER (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 4); gtk_container_add (GTK_CONTAINER (frame), table); diff --git a/gnome/gscreen.c b/gnome/gscreen.c index aea782c3f..03b9c623d 100644 --- a/gnome/gscreen.c +++ b/gnome/gscreen.c @@ -2154,7 +2154,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel) * Status line and packing of all of the toys */ status_line = gtk_hbox_new (0, 0); - gtk_container_border_width (GTK_CONTAINER (status_line), 3); + gtk_container_set_border_width (GTK_CONTAINER (status_line), 3); gtk_label_set_justify (GTK_LABEL (panel->ministatus), GTK_JUSTIFY_LEFT); gtk_box_pack_start (GTK_BOX (status_line), panel->back_b, 0, 0, 2); @@ -2174,7 +2174,7 @@ x_create_panel (Dlg_head *h, widget_data parent, WPanel *panel) */ frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_container_border_width (GTK_CONTAINER (frame), 3); + gtk_container_set_border_width (GTK_CONTAINER (frame), 3); panel->status = gtk_label_new (""); /* used to be a cliplabel */ gtk_misc_set_alignment (GTK_MISC (panel->status), 0.0, 0.5); diff --git a/gnome/gtools.c b/gnome/gtools.c index 96b3a7d98..9279cba89 100644 --- a/gnome/gtools.c +++ b/gnome/gtools.c @@ -84,7 +84,7 @@ int query_dialog (char *header, char *text, int flags, int count, ...) /* Now do the GTK stuff */ gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (label->widget.wdata)); - gtk_container_border_width (GTK_CONTAINER (dialog->vbox), 5); + gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 5); g_list_foreach (list, (GFunc) pack_button, dialog->action_area); g_list_free (list);