]>
Commit | Line | Data |
---|---|---|
040995db | 1 | diff -u libglade/configure.in:1.36 libglade/configure.in:1.37 |
2 | --- libglade/configure.in:1.36 Tue Aug 1 11:50:13 2000 | |
3 | +++ libglade/configure.in Sun Aug 13 04:44:35 2000 | |
4 | @@ -50,7 +50,7 @@ | |
5 | AM_CONDITIONAL(GNOME_SUPPORT, $have_gnome) | |
6 | ||
7 | have_bonobo=false | |
8 | -AM_PATH_BONOBO(0.10, have_bonobo=true) | |
9 | +AM_PATH_BONOBO(0.17, have_bonobo=true) | |
10 | AM_CONDITIONAL(BONOBO_SUPPORT, $have_bonobo) | |
11 | ||
12 | ||
13 | diff -u libglade/glade/glade-bonobo.c:1.4 libglade/glade/glade-bonobo.c:1.5 | |
14 | --- libglade/glade/glade-bonobo.c:1.4 Sat May 20 06:34:41 2000 | |
15 | +++ libglade/glade/glade-bonobo.c Sat Aug 12 22:44:36 2000 | |
16 | @@ -49,7 +49,7 @@ | |
17 | { | |
18 | GtkWidget *widget; | |
19 | BonoboControlFrame *cf; | |
20 | - BonoboPropertyBagClient *pbc; | |
21 | + Bonobo_PropertyBag pb; | |
22 | GList *tmp; | |
23 | ||
24 | g_return_val_if_fail (info->class != NULL, NULL); | |
25 | @@ -69,37 +69,37 @@ | |
26 | return NULL; | |
27 | } | |
28 | ||
29 | - pbc = bonobo_control_frame_get_control_property_bag (cf); | |
30 | - if (!pbc) | |
31 | + pb = bonobo_control_frame_get_control_property_bag (cf, NULL); | |
32 | + if (pb == CORBA_OBJECT_NIL) | |
33 | return widget; | |
34 | ||
35 | for (tmp = info->attributes; tmp; tmp = tmp->next) { | |
36 | GladeAttribute *attr = tmp->data; | |
37 | CORBA_TypeCode tc; | |
38 | ||
39 | - tc = bonobo_property_bag_client_get_property_type (pbc, attr->name); | |
40 | + tc = bonobo_property_bag_client_get_property_type (pb, attr->name, NULL); | |
41 | ||
42 | switch (tc->kind) { | |
43 | ||
44 | case CORBA_tk_boolean: | |
45 | - bonobo_property_bag_client_set_value_gboolean (pbc, attr->name, | |
46 | - attr->value[0] == 'T'); | |
47 | + bonobo_property_bag_client_set_value_gboolean (pb, attr->name, | |
48 | + attr->value[0] == 'T', NULL); | |
49 | break; | |
50 | ||
51 | case CORBA_tk_string: | |
52 | - bonobo_property_bag_client_set_value_string (pbc, attr->name, attr->value); | |
53 | + bonobo_property_bag_client_set_value_string (pb, attr->name, attr->value, NULL); | |
54 | break; | |
55 | ||
56 | case CORBA_tk_long: | |
57 | - bonobo_property_bag_client_set_value_glong (pbc, attr->name, strtol (attr->value, NULL, 0)); | |
58 | + bonobo_property_bag_client_set_value_glong (pb, attr->name, strtol (attr->value, NULL, 0), NULL); | |
59 | break; | |
60 | ||
61 | case CORBA_tk_float: | |
62 | - bonobo_property_bag_client_set_value_gfloat (pbc, attr->name, strtod (attr->value, NULL)); | |
63 | + bonobo_property_bag_client_set_value_gfloat (pb, attr->name, strtod (attr->value, NULL), NULL); | |
64 | break; | |
65 | ||
66 | case CORBA_tk_double: | |
67 | - bonobo_property_bag_client_set_value_gdouble (pbc, attr->name, strtod (attr->value, NULL)); | |
68 | + bonobo_property_bag_client_set_value_gdouble (pb, attr->name, strtod (attr->value, NULL), NULL); | |
69 | break; | |
70 | ||
71 | default: |