diff options
| author | Martin Baulig <baulig@suse.de> | 2001-03-23 11:13:34 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2001-03-23 11:13:34 +0000 |
| commit | 125211d5b4338ce963b03f174382473116d505cb (patch) | |
| tree | 9f128fb1029b2e4b2a26332abcbb9f7a9c4fccd9 /examples | |
| parent | d3f528d383c338c11271203e208ba17faf0a907c (diff) | |
| download | gconf-125211d5b4338ce963b03f174382473116d505cb.tar.gz | |
Removed. Removed. Removed.
2001-03-18 Martin Baulig <baulig@suse.de>
* gconf/gthreadpool.[ch]: Removed.
* gconf/gconf-glib-private.h: Removed.
* gconf/gconf-glib-public.h: Removed.
* gconf/gconf-client.[ch]: Moved here from wrappers/gtk/
and migrated to use GObject.
* gconf/testgconfclient.c: Moved here from wrappers/gtk/.
* gconf/gconf-internals.h
(gconf_CORBA_Object_hash, gconf_CORBA_Object_equal):
New static inline functions.
* gconf/gconfmarshal.list: New file.
* gconf/gconftool.c: Use libxml 2.
* backends/xml-backend.c, backends/xml-cache.h,
backends/xml-dir.c, backends/xml-dir.h,
backends/xml-entry.c, backends/xml-entry.h: Use libxml 2.
* wrappers/gtk/*: Moved to gconf/.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 4 | ||||
| -rw-r--r-- | examples/basic-gconf-app.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 9092b257..d1fb8808 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,6 @@ INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gconf -I$(top_builddir)/gconf \ -I$(top_srcdir)/wrappers/gtk -I$(top_builddir)/wrappers/gtk \ - $(GLIB_CFLAGS) $(OAF_CFLAGS) $(GMODULE_CFLAGS) $(ORBIT_CFLAGS) $(GTK_CFLAGS) \ + $(GLIB_CFLAGS) $(OAF_CFLAGS) $(GMODULE_CFLAGS) $(GTK_CFLAGS) \ -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\" EFENCE= @@ -13,7 +13,7 @@ endif noinst_PROGRAMS=$(GTK_EXAMPLES) -GTK_EXAMPLES_LINK= $(EFENCE) $(INTLLIBS) $(ORBIT_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(top_builddir)/wrappers/gtk/libgconf-gtk-$(MAJOR_VERSION).la $(EFENCE) +GTK_EXAMPLES_LINK= $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(EFENCE) basic_gconf_app_SOURCES = basic-gconf-app.c diff --git a/examples/basic-gconf-app.c b/examples/basic-gconf-app.c index 3b9e2118..9560a08a 100644 --- a/examples/basic-gconf-app.c +++ b/examples/basic-gconf-app.c @@ -85,7 +85,7 @@ main(int argc, char** argv) /* This ensures we cleanly detach from the GConf server (assuming * we hold the last reference) */ - gtk_object_unref(GTK_OBJECT(client)); + g_object_unref(G_OBJECT(client)); return 0; } @@ -176,7 +176,7 @@ create_configurable_widget(GConfClient* client, const gchar* config_key) gtk_object_set_data(GTK_OBJECT(label), "client", client); gtk_signal_connect(GTK_OBJECT(label), "destroy", - configurable_widget_destroy_callback, + GTK_SIGNAL_FUNC(configurable_widget_destroy_callback), NULL); return frame; @@ -502,11 +502,11 @@ create_config_entry(GtkWidget* prefs_dialog, GConfClient* client, const gchar* c gtk_object_set_data(GTK_OBJECT(entry), "key", g_strdup(config_key)); gtk_signal_connect(GTK_OBJECT(entry), "destroy", - config_entry_destroy_callback, + GTK_SIGNAL_FUNC(config_entry_destroy_callback), NULL); gtk_signal_connect(GTK_OBJECT(entry), "changed", - config_entry_changed_callback, + GTK_SIGNAL_FUNC(config_entry_changed_callback), prefs_dialog); /* A dubious hack; set the entry as object data using its @@ -571,7 +571,7 @@ prefs_dialog_destroy_callback(GtkWidget* dialog, gpointer data) if (revert_cs) gconf_change_set_unref(revert_cs); - gtk_object_unref(GTK_OBJECT(client)); + g_object_unref(G_OBJECT(client)); } static GtkWidget* @@ -588,7 +588,7 @@ create_prefs_dialog(GtkWidget* parent, GConfClient* client) GtkWidget* vbox_inner; GtkWidget* entry; - dialog = gtk_window_new(GTK_WINDOW_DIALOG); + dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); apply = gtk_button_new_with_label("Apply"); revert = gtk_button_new_with_label("Revert"); @@ -623,7 +623,7 @@ create_prefs_dialog(GtkWidget* parent, GConfClient* client) gtk_object_set_data(GTK_OBJECT(dialog), "client", client); /* Grab a reference */ - gtk_object_ref(GTK_OBJECT(client)); + g_object_ref(G_OBJECT(client)); gtk_signal_connect(GTK_OBJECT(dialog), "destroy", GTK_SIGNAL_FUNC(prefs_dialog_destroy_callback), |