summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--batmon/batmon.c24
-rw-r--r--battery/battery.c6
-rw-r--r--fish/fish.c2
-rw-r--r--gen_util/clock.c4
-rw-r--r--gen_util/mailcheck.c2
-rw-r--r--gen_util/printer.c2
-rw-r--r--gkb/gkb.c6
-rw-r--r--gnome-pager/gnomepager_applet.c33
-rw-r--r--mailcheck/ChangeLog14
-rw-r--r--mailcheck/mailcheck.c2
-rw-r--r--mini-commander/src/command_line.c6
-rw-r--r--mini-commander/src/message.c6
-rw-r--r--mini-commander/src/mini-commander_applet.c4
-rw-r--r--mini-commander/src/preferences.c14
-rw-r--r--multiload/load-graph.c2
-rw-r--r--multiload/property-entries.c2
17 files changed, 87 insertions, 56 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c70f03ac..9d401c1ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+1999-01-18 Jeff Garzik <jgarzik@pobox.com>
+
+ * batmon/batmon.c, battery/battery.c, fish/fish.c, gen_util/clock.c,
+ gen_util/mailcheck.c, gen_util/printer.c, gkb/gkb.c,
+ gnome-pager/gnomepager_applet.c, mini-commander/src/command_line.c,
+ mini-commander/src/message.c,
+ mini-commander/src/mini-commander_applet.c,
+ mini-commander/src/preferences.c, multiload/load-graph.c,
+ multiload/property-entries.c:
+ Gtk+ s/old-name/new-name/ substitutions, from gtkcompat.h
+
+ * gnome-pager/gnomepager_applet.c:
+ 64-bitness casts. Added a FIXME for a value apparently never used.
+
1999-01-18 Nat Friedman <nat@nat.org>
* asclock/dialogs.c (properties_dialog): Fixed a typo. Use
diff --git a/batmon/batmon.c b/batmon/batmon.c
index 70dcc26e3..e771f921e 100644
--- a/batmon/batmon.c
+++ b/batmon/batmon.c
@@ -142,8 +142,8 @@ batmon_timeout_callback (gpointer *data)
batmin /= 60;
/* As stated above, we show the APM Driver and APM BIOS versions. */
- gtk_label_set (GTK_LABEL (driverlabel), string[0]);
- gtk_label_set (GTK_LABEL (bioslabel), string[1]);
+ gtk_label_set_text (GTK_LABEL (driverlabel), string[0]);
+ gtk_label_set_text (GTK_LABEL (bioslabel), string[1]);
g_free (mempoint);
#elif __FreeBSD__
@@ -194,7 +194,7 @@ batmon_timeout_callback (gpointer *data)
g_snprintf(str, sizeof(str), "%d.%d", aip.ai_major, aip.ai_minor);
- gtk_label_set (GTK_LABEL (bioslabel), str);
+ gtk_label_set_text (GTK_LABEL (bioslabel), str);
close(fd);
#else
@@ -208,28 +208,28 @@ batmon_timeout_callback (gpointer *data)
check which flags are set? */
switch (batflag) {
case NOEXIST_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("There is no battery?!?"));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("There is no battery?!?"));
break;
case HIGH_MASK | CHARGE_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("High and charging."));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("High and charging."));
break;
case HIGH_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("High."));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("High."));
break;
case LOW_MASK | CHARGE_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("Low and charging."));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("Low and charging."));
break;
case LOW_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("Low."));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("Low."));
break;
case CRIT_MASK | CHARGE_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("Critical and charging."));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("Critical and charging."));
break;
case CRIT_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("Critical!!"));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("Critical!!"));
break;
case CHARGE_MASK:
- gtk_label_set (GTK_LABEL (statlabel), _("Charging."));
+ gtk_label_set_text (GTK_LABEL (statlabel), _("Charging."));
break;
}
@@ -255,7 +255,7 @@ batmon_timeout_callback (gpointer *data)
g_warning (_("More than 100,000,000 minutes of battery life?!?"));
return FALSE;
}
- gtk_label_set (GTK_LABEL (minlabel), str);
+ gtk_label_set_text (GTK_LABEL (minlabel), str);
gtk_tooltips_set_tip (tooltips, GTK_WIDGET (data), tipstr, NULL);
diff --git a/battery/battery.c b/battery/battery.c
index 0c9e88822..de3155b04 100644
--- a/battery/battery.c
+++ b/battery/battery.c
@@ -216,7 +216,7 @@ battery_update(gpointer data)
{
/* Now update the labels in readout mode. */
snprintf(labelstr, sizeof(labelstr), "%d%%", percentage);
- gtk_label_set(GTK_LABEL(bat->readout_label_percentage), labelstr);
+ gtk_label_set_text (GTK_LABEL(bat->readout_label_percentage), labelstr);
}
if (last_minutes_remaining != minutes_remaining ||
@@ -224,12 +224,12 @@ battery_update(gpointer data)
{
/* If we cannot update the time-remaining label, then make it blank */
if (minutes_remaining == -1 || hours_remaining == -1)
- gtk_label_set(GTK_LABEL(bat->readout_label_time), "");
+ gtk_label_set_text (GTK_LABEL(bat->readout_label_time), "");
else
{
snprintf(labelstr, sizeof(labelstr), "%d:%02d", hours_remaining,
minutes_remaining);
- gtk_label_set(GTK_LABEL(bat->readout_label_time), labelstr);
+ gtk_label_set_text (GTK_LABEL(bat->readout_label_time), labelstr);
}
}
diff --git a/fish/fish.c b/fish/fish.c
index 6a1c8c5e5..e4acf812c 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -133,7 +133,7 @@ apply_properties(Fish *fish)
g_free(tmp);
tmp = splice_name(label_format, fish->prop.name);
- gtk_label_set(GTK_LABEL(fish->fortune_label), tmp);
+ gtk_label_set_text(GTK_LABEL(fish->fortune_label), tmp);
g_free(tmp);
}
diff --git a/gen_util/clock.c b/gen_util/clock.c
index a062ee129..9a33dfa26 100644
--- a/gen_util/clock.c
+++ b/gen_util/clock.c
@@ -119,7 +119,7 @@ computer_clock_update_func(ClockData * cd, time_t current_time)
if (strftime(date, 20, _("%a %b %d"), tm) == 20)
date[19] = '\0';
}
- gtk_label_set(GTK_LABEL(cc->date), date);
+ gtk_label_set_text(GTK_LABEL(cc->date), date);
if (!GTK_WIDGET_VISIBLE(cc->date))
gtk_widget_show (cc->date);
} else {
@@ -143,7 +143,7 @@ computer_clock_update_func(ClockData * cd, time_t current_time)
if (strftime(hour, 20, _("%H:%M"), tm) == 20)
hour[19] = '\0';
}
- gtk_label_set(GTK_LABEL(cc->time), hour);
+ gtk_label_set_text(GTK_LABEL(cc->time), hour);
}
static void
diff --git a/gen_util/mailcheck.c b/gen_util/mailcheck.c
index 924f15acb..6917fa57a 100644
--- a/gen_util/mailcheck.c
+++ b/gen_util/mailcheck.c
@@ -248,7 +248,7 @@ mail_check_timeout (gpointer data)
text = _("You have mail.");
} else
text = _("No mail.");
- gtk_label_set (GTK_LABEL (mc->label), text);
+ gtk_label_set_text (GTK_LABEL (mc->label), text);
break;
}
}
diff --git a/gen_util/printer.c b/gen_util/printer.c
index 513600e82..805ff6bbe 100644
--- a/gen_util/printer.c
+++ b/gen_util/printer.c
@@ -286,7 +286,7 @@ apply_properties (GtkWidget *widget, gint button_num, gpointer data)
Printer *pr = data;
apply_one (pr->prop_name, &pr->print_title);
apply_one (pr->prop_command, &pr->print_command);
- gtk_label_set (GTK_LABEL (pr->label), pr->print_title);
+ gtk_label_set_text (GTK_LABEL (pr->label), pr->print_title);
position_label (pr->label, pr->ev);
}
diff --git a/gkb/gkb.c b/gkb/gkb.c
index ce4909dbe..db827e953 100644
--- a/gkb/gkb.c
+++ b/gkb/gkb.c
@@ -178,7 +178,7 @@ properties_dialog(AppletWidget *applet,
combo1 = gtk_combo_new ();
gtk_box_pack_start (GTK_BOX (hbox8), combo1, FALSE, FALSE, 30);
- gtk_container_border_width (GTK_CONTAINER (combo1), 2);
+ gtk_container_set_border_width (GTK_CONTAINER (combo1), 2);
combo1_items = g_list_append (combo1_items, temp_props.dmap[0]);
@@ -208,7 +208,7 @@ properties_dialog(AppletWidget *applet,
combo2 = gtk_combo_new ();
gtk_box_pack_start (GTK_BOX (hbox8), combo2, FALSE, FALSE, 30);
- gtk_container_border_width (GTK_CONTAINER (combo2), 2);
+ gtk_container_set_border_width (GTK_CONTAINER (combo2), 2);
GTK_WIDGET_SET_FLAGS (combo2, GTK_CAN_FOCUS);
combo2_items = g_list_append (combo2_items, temp_props.dmap[1]);
@@ -229,7 +229,7 @@ properties_dialog(AppletWidget *applet,
frame2 = gtk_frame_new ("Program");
gtk_box_pack_start (GTK_BOX (hbox5), frame2, FALSE, FALSE, 0);
- gtk_container_border_width (GTK_CONTAINER (frame2), 8);
+ gtk_container_set_border_width (GTK_CONTAINER (frame2), 8);
option1 = gtk_option_menu_new ();
gtk_container_add (GTK_CONTAINER (frame2), option1);
diff --git a/gnome-pager/gnomepager_applet.c b/gnome-pager/gnomepager_applet.c
index 9f01cffa8..28b054ea4 100644
--- a/gnome-pager/gnomepager_applet.c
+++ b/gnome-pager/gnomepager_applet.c
@@ -375,7 +375,7 @@ cb_applet_properties(AppletWidget * widget, gpointer data)
gtk_table_attach(GTK_TABLE(table), check,
2, 4, 4, 5, GTK_FILL|GTK_EXPAND,0,0,0);
check = gtk_check_button_new_with_label(_("Show task list button"));
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(check), show_arrow);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(check), show_arrow);
gtk_signal_connect(GTK_OBJECT(check), "clicked",
GTK_SIGNAL_FUNC(cb_check_show_arrow), NULL);
gtk_object_set_data(GTK_OBJECT(check), "prop", prop);
@@ -1374,7 +1374,7 @@ main(int argc, char *argv[])
gtk_widget_show(l);
gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(d)->vbox), l, TRUE, TRUE, 5);
gtk_window_set_modal(GTK_WINDOW(d),TRUE);
- gtk_window_position(GTK_WINDOW(d), GTK_WIN_POS_CENTER);
+ gtk_window_set_position (GTK_WINDOW(d), GTK_WIN_POS_CENTER);
gnome_dialog_run(GNOME_DIALOG(d));
gtk_widget_destroy(d);
@@ -1488,7 +1488,7 @@ desktop_cb_button_down(GtkWidget * widget, GdkEventButton *event)
gint x, y, w, h;
button = event->button;
- desk = (gint)gtk_object_get_data(GTK_OBJECT(widget), "desktop");
+ desk = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "desktop"));
if (button == 1)
gnome_win_hints_set_current_workspace(desk);
@@ -1513,7 +1513,7 @@ desktop_cb_button_up(GtkWidget * widget, GdkEventButton *event)
gint desk, selm, button;
button = event->button;
- desk = (gint)gtk_object_get_data(GTK_OBJECT(widget), "desktop");
+ desk = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "desktop"));
}
void
@@ -1555,8 +1555,11 @@ desktop_cb_redraw(GtkWidget *widget, gpointer data)
return;
if (!(show_pager))
return;
- desk = (gint)gtk_object_get_data(GTK_OBJECT(widget), "desktop");
- sel = (gint)gtk_object_get_data(GTK_OBJECT(widget), "select");
+ desk = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "desktop"));
+
+ /* FIXME: sel is currently always zero */
+ sel = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "select"));
+
w = widget->allocation.width - 4;
h = widget->allocation.height - 4;
s = widget->style;
@@ -1630,8 +1633,8 @@ make_desktop_pane(gint desktop, gint width, gint height)
else
height = (height * area_h) / area_w;
gtk_drawing_area_size(GTK_DRAWING_AREA(area), width, height);
- gtk_object_set_data(GTK_OBJECT(area), "desktop", (gpointer)desktop);
- gtk_object_set_data(GTK_OBJECT(area), "select", (gpointer)0);
+ gtk_object_set_data(GTK_OBJECT(area), "desktop", GINT_TO_POINTER (desktop));
+ gtk_object_set_data(GTK_OBJECT(area), "select", GINT_TO_POINTER (0));
gtk_widget_set_events(area, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK);
@@ -1703,7 +1706,7 @@ create_popbox(void)
gtk_widget_show(widg);
gtk_frame_set_label_align(GTK_FRAME(widg), 0.5, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), widg, FALSE, FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(widg), 4);
+ gtk_container_set_border_width (GTK_CONTAINER(widg), 4);
widg2 = gtk_alignment_new(0.5, 0.0, 0.0, 0.0);
gtk_widget_show(widg2);
gtk_container_add(GTK_CONTAINER(widg), widg2);
@@ -2098,9 +2101,9 @@ set_task_info_to_button(Task *t)
}
if ((label) && (t->name))
- gtk_label_set(GTK_LABEL(label), t->name);
+ gtk_label_set_text (GTK_LABEL(label), t->name);
else if (label)
- gtk_label_set(GTK_LABEL(label), "???");
+ gtk_label_set_text (GTK_LABEL(label), "???");
gtk_widget_size_request(button, &req);
if ((applet_orient == ORIENT_UP) || (applet_orient == ORIENT_DOWN))
{
@@ -2119,12 +2122,12 @@ set_task_info_to_button(Task *t)
else
str = util_reduce_chars("???", len);
if (label)
- gtk_label_set(GTK_LABEL(label), str);
+ gtk_label_set_text (GTK_LABEL(label), str);
g_free(str);
gtk_widget_size_request(button, &req);
}
if ((len <=0) && (label))
- gtk_label_set(GTK_LABEL(label), "");
+ gtk_label_set_text (GTK_LABEL(label), "");
}
else
{
@@ -2144,12 +2147,12 @@ set_task_info_to_button(Task *t)
else
str = util_reduce_chars("???", len);
if (label)
- gtk_label_set(GTK_LABEL(label), str);
+ gtk_label_set_text (GTK_LABEL(label), str);
g_free(str);
gtk_widget_size_request(button, &req);
}
if ((len <=0) && (label))
- gtk_label_set(GTK_LABEL(label), "");
+ gtk_label_set_text (GTK_LABEL(label), "");
}
}
diff --git a/mailcheck/ChangeLog b/mailcheck/ChangeLog
index 2c70f03ac..9d401c1ee 100644
--- a/mailcheck/ChangeLog
+++ b/mailcheck/ChangeLog
@@ -1,3 +1,17 @@
+1999-01-18 Jeff Garzik <jgarzik@pobox.com>
+
+ * batmon/batmon.c, battery/battery.c, fish/fish.c, gen_util/clock.c,
+ gen_util/mailcheck.c, gen_util/printer.c, gkb/gkb.c,
+ gnome-pager/gnomepager_applet.c, mini-commander/src/command_line.c,
+ mini-commander/src/message.c,
+ mini-commander/src/mini-commander_applet.c,
+ mini-commander/src/preferences.c, multiload/load-graph.c,
+ multiload/property-entries.c:
+ Gtk+ s/old-name/new-name/ substitutions, from gtkcompat.h
+
+ * gnome-pager/gnomepager_applet.c:
+ 64-bitness casts. Added a FIXME for a value apparently never used.
+
1999-01-18 Nat Friedman <nat@nat.org>
* asclock/dialogs.c (properties_dialog): Fixed a typo. Use
diff --git a/mailcheck/mailcheck.c b/mailcheck/mailcheck.c
index 924f15acb..6917fa57a 100644
--- a/mailcheck/mailcheck.c
+++ b/mailcheck/mailcheck.c
@@ -248,7 +248,7 @@ mail_check_timeout (gpointer data)
text = _("You have mail.");
} else
text = _("No mail.");
- gtk_label_set (GTK_LABEL (mc->label), text);
+ gtk_label_set_text (GTK_LABEL (mc->label), text);
break;
}
}
diff --git a/mini-commander/src/command_line.c b/mini-commander/src/command_line.c
index c7c753ef2..97d1de20e 100644
--- a/mini-commander/src/command_line.c
+++ b/mini-commander/src/command_line.c
@@ -247,7 +247,7 @@ showHistory_signal(GtkWidget *widget, gpointer data)
GTK_SIGNAL_FUNC(historyPopupClicked_cb),
NULL);
/* position */
- gtk_window_position(GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
/* size */
gtk_widget_set_usize(GTK_WIDGET(window), 200, 350);
/* title */
@@ -271,7 +271,7 @@ showHistory_signal(GtkWidget *widget, gpointer data)
GTK_SIGNAL_FUNC(historyPopupClickedInside_cb),
NULL);
gtk_container_add(GTK_CONTAINER(frame), scrolled_window);
- gtk_container_border_width(GTK_CONTAINER(scrolled_window), 2);
+ gtk_container_set_border_width (GTK_CONTAINER(scrolled_window), 2);
gtk_widget_show(scrolled_window);
@@ -385,7 +385,7 @@ showFileBrowser_signal(GtkWidget *widget, gpointer data)
/* Set as modal */
gtk_window_set_modal(GTK_WINDOW(fileSelect),TRUE);
- gtk_window_position(GTK_WINDOW (fileSelect), GTK_WIN_POS_MOUSE);
+ gtk_window_set_position (GTK_WINDOW (fileSelect), GTK_WIN_POS_MOUSE);
gtk_widget_show(fileSelect);
diff --git a/mini-commander/src/message.c b/mini-commander/src/message.c
index faf268175..78fbc2138 100644
--- a/mini-commander/src/message.c
+++ b/mini-commander/src/message.c
@@ -49,7 +49,7 @@ void showMessage(gchar *message)
label update doesn't work the way it should */
/* gtk_widget_hide (applet); */
- gtk_label_set(GTK_LABEL(labelMessage), message);
+ gtk_label_set_text(GTK_LABEL(labelMessage), message);
/* refresh frame; otherwise it is covered by the label;
a bug in gtk? */
/* gtk_widget_hide (frame);
@@ -72,7 +72,7 @@ hideMessage(gpointer data)
/* this is the message which has to be removed;
otherwise don't hide this message */
/* gtk_widget_hide (applet); */
- gtk_label_set(GTK_LABEL(labelMessage), " ");
+ gtk_label_set_text(GTK_LABEL(labelMessage), " ");
/* gtk_widget_show (applet); */
messageLocked = FALSE;
}
@@ -113,7 +113,7 @@ showInterestingInformation(gpointer data)
gtk_label_get(GTK_LABEL(labelMessage), &currentMessage);
if(strcmp(message, currentMessage) != 0)
{
- gtk_label_set(GTK_LABEL(labelMessage), message);
+ gtk_label_set_text(GTK_LABEL(labelMessage), message);
/* refresh frame; otherwise it is covered by the label;
a bug in gtk? */
/* gtk_widget_hide (frame);
diff --git a/mini-commander/src/mini-commander_applet.c b/mini-commander/src/mini-commander_applet.c
index 6356a6bc6..c133784ff 100644
--- a/mini-commander/src/mini-commander_applet.c
+++ b/mini-commander/src/mini-commander_applet.c
@@ -154,7 +154,7 @@ main(int argc, char **argv)
NULL);
vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_border_width(GTK_CONTAINER(vbox), 0);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 0);
/* add command line; position: top */
initCommandEntry();
@@ -199,7 +199,7 @@ main(int argc, char **argv)
/* add buttons into frame */
frame = gtk_frame_new(NULL);
- gtk_container_border_width(GTK_CONTAINER(frame), 1);
+ gtk_container_set_border_width(GTK_CONTAINER(frame), 1);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(frame), hboxButtons);
gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0);
diff --git a/mini-commander/src/preferences.c b/mini-commander/src/preferences.c
index 6fbfbc7b6..c8bef52ed 100644
--- a/mini-commander/src/preferences.c
+++ b/mini-commander/src/preferences.c
@@ -433,13 +433,13 @@ propertiesBox(AppletWidget *applet, gpointer data)
/* time & date */
vbox = gtk_vbox_new(FALSE, GNOME_PAD_BIG);
- gtk_container_border_width(GTK_CONTAINER(vbox), GNOME_PAD_SMALL);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), GNOME_PAD_SMALL);
frame = gtk_frame_new(_("Clock"));
gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
vbox1 = gtk_vbox_new(FALSE, GNOME_PAD_SMALL);
- gtk_container_border_width(GTK_CONTAINER(vbox1), GNOME_PAD_SMALL);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox1), GNOME_PAD_SMALL);
gtk_container_add(GTK_CONTAINER(frame), vbox1);
/* show time check box */
@@ -476,7 +476,7 @@ propertiesBox(AppletWidget *applet, gpointer data)
/* gtk_table_set_row_spacing(GTK_TABLE(table), 1, GNOME_PAD_SMALL);
gtk_table_set_row_spacing(GTK_TABLE(table), 2, 20); */ /* no effect? */
gtk_table_set_col_spacings(GTK_TABLE(table), GNOME_PAD_SMALL);
- gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD_SMALL);
+ gtk_container_set_border_width(GTK_CONTAINER(table), GNOME_PAD_SMALL);
gtk_container_add(GTK_CONTAINER(frame), table);
/* applet width */
@@ -584,7 +584,7 @@ propertiesBox(AppletWidget *applet, gpointer data)
table = gtk_table_new(2, 2, FALSE);
gtk_table_set_row_spacings(GTK_TABLE(table), GNOME_PAD_SMALL);
gtk_table_set_col_spacings(GTK_TABLE(table), GNOME_PAD_SMALL);
- gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD_SMALL);
+ gtk_container_set_border_width(GTK_CONTAINER(table), GNOME_PAD_SMALL);
gtk_container_add(GTK_CONTAINER(frame), table);
/* fg */
@@ -663,17 +663,17 @@ propertiesBox(AppletWidget *applet, gpointer data)
/* Macros */
frame = gtk_frame_new((gchar *) NULL);
- gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
+ gtk_container_set_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
scrolledWindow = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_container_border_width(GTK_CONTAINER(scrolledWindow), GNOME_PAD_SMALL);
+ gtk_container_set_border_width(GTK_CONTAINER(scrolledWindow), GNOME_PAD_SMALL);
gtk_container_add(GTK_CONTAINER(frame), scrolledWindow);
vbox1 = gtk_vbox_new(TRUE, GNOME_PAD_SMALL);
- gtk_container_border_width(GTK_CONTAINER(vbox1), GNOME_PAD_SMALL);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox1), GNOME_PAD_SMALL);
/* gtk_container_add(GTK_CONTAINER(scrolledWindow), vbox1); does not work */
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolledWindow), vbox1);
diff --git a/multiload/load-graph.c b/multiload/load-graph.c
index f687a02fe..318d1df51 100644
--- a/multiload/load-graph.c
+++ b/multiload/load-graph.c
@@ -158,7 +158,7 @@ load_graph_properties_init (GnomePropertyObject *object)
};
vb = gtk_vbox_new (FALSE, 0);
- gtk_container_border_width (GTK_CONTAINER (vb), GNOME_PAD_SMALL);
+ gtk_container_set_border_width (GTK_CONTAINER (vb), GNOME_PAD_SMALL);
frame = gnome_property_entry_colors (object, _("Colors"), prop_data->n,
prop_data->n, NULL, prop_data->colors,
diff --git a/multiload/property-entries.c b/multiload/property-entries.c
index 95c1c9cbd..ae9944aa2 100644
--- a/multiload/property-entries.c
+++ b/multiload/property-entries.c
@@ -67,7 +67,7 @@ gnome_property_entry_adjustments (GnomePropertyObject *object,
table = gtk_table_new (rows, columns * internal_columns, TRUE);
gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD << 2);
- gtk_container_border_width (GTK_CONTAINER (table), GNOME_PAD_SMALL);
+ gtk_container_set_border_width (GTK_CONTAINER (table), GNOME_PAD_SMALL);
for (i = 0; i < num_items; i++) {
glong *data = &(data_ptr [i*8]);