Try to resolve a listener to make sure that something is listening when we
2001-10-13 Bradford Hovinen <hovinen@ximian.com> * bonobo-config-archiver.c (real_sync): Try to resolve a listener to make sure that something is listening when we issue the sync event (disabled for now) (get_listener_oafiid): Implement (disabled for now) 2001-10-12 Bradford Hovinen <hovinen@ximian.com> * capplet-util.c (get_factory_name): Updated factory name to reflect new, expanded roles * Bonobo_Control_Capplet_generic.oaf.in: Create 2001-09-29 Bradford Hovinen <hovinen@ximian.com> * capplet-util.c (create_control_cb): Elimite reference counter -- it's not necessary (create_control_cb): Make this a multi-factory so that we can return the listener when needed (capplet_init): Set up the listener here rather than in get_control_cb; also remove the listener and unref the database here (quit_cb, real_quit_cb): Remove (thank the gods) 2001-10-12 Bradford Hovinen <hovinen@ximian.com> * Makefile.am ($(oaffile)): Make creation of the .oaf file generic 2001-10-12 Bradford Hovinen <hovinen@ximian.com> * capplet-dir.c (capplet_control_launch): Unref the property bag when we are done
This commit is contained in:
Bradford Hovinen
Bradford Hovinen (Gdict maintainer)
parent
99b228af09
commit
4b6d9f7f99
21 changed files with 232 additions and 209 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2001-10-13 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* bonobo-config-archiver.c (real_sync): Try to resolve a listener
|
||||
to make sure that something is listening when we issue the sync
|
||||
event (disabled for now)
|
||||
(get_listener_oafiid): Implement (disabled for now)
|
||||
|
||||
2001-10-05 Shaun Merrigan <shaun.merrigan@sun.com>
|
||||
|
||||
* archiver-client.c (location_client_load_rollback_data):
|
||||
|
|
|
|||
|
|
@ -31,6 +31,15 @@ static GtkObjectClass *parent_class = NULL;
|
|||
#define PARENT_TYPE BONOBO_CONFIG_DATABASE_TYPE
|
||||
#define FLUSH_INTERVAL 30 /* 30 seconds */
|
||||
|
||||
/* Small Bonobo bug here... */
|
||||
|
||||
#undef BONOBO_RET_EX
|
||||
#define BONOBO_RET_EX(ev) \
|
||||
G_STMT_START{ \
|
||||
if (BONOBO_EX (ev)) \
|
||||
return; \
|
||||
}G_STMT_END
|
||||
|
||||
extern int daytime;
|
||||
|
||||
static DirEntry *
|
||||
|
|
@ -211,12 +220,38 @@ real_get_value (BonoboConfigDatabase *db,
|
|||
return value;
|
||||
}
|
||||
|
||||
#if 0 /* Disabled now to be safe */
|
||||
|
||||
/* Produce a new, dynamically allocated string with the OAF IID of the listener
|
||||
* associated with the given backend id
|
||||
*/
|
||||
|
||||
static gchar *
|
||||
get_listener_oafiid (const gchar *backend_id)
|
||||
{
|
||||
gchar *oafiid, *tmp, *tmp1;
|
||||
|
||||
tmp = g_strdup (backend_id);
|
||||
if ((tmp1 = strstr (tmp, "-properties")) != NULL) *tmp1 = '\0';
|
||||
oafiid = g_strconcat ("OAFIID:Bonobo_Listener_", tmp, NULL);
|
||||
g_free (tmp);
|
||||
|
||||
return oafiid;
|
||||
}
|
||||
|
||||
#endif /* Disabled */
|
||||
|
||||
static void
|
||||
real_sync (BonoboConfigDatabase *db,
|
||||
CORBA_Environment *ev)
|
||||
{
|
||||
BonoboConfigArchiver *archiver_db = BONOBO_CONFIG_ARCHIVER (db);
|
||||
BonoboArg *arg;
|
||||
BonoboArg *arg;
|
||||
|
||||
#if 0 /* Disabled now to be safe */
|
||||
gchar *listener_oafiid;
|
||||
Bonobo_Listener listener;
|
||||
#endif /* Disabled */
|
||||
|
||||
if (!db->writeable)
|
||||
return;
|
||||
|
|
@ -229,9 +264,33 @@ real_sync (BonoboConfigDatabase *db,
|
|||
location_client_store_xml (archiver_db->location, archiver_db->backend_id,
|
||||
archiver_db->doc, ConfigArchiver_STORE_MASK_PREVIOUS, ev);
|
||||
|
||||
BONOBO_RET_EX (ev);
|
||||
|
||||
#if 0 /* Disabled now to be safe */
|
||||
|
||||
/* Try to find a listener to apply the settings. If we can't, don't
|
||||
* worry about it
|
||||
*/
|
||||
|
||||
listener_oafiid = get_listener_oafiid (archiver_db->backend_id);
|
||||
listener = bonobo_get_object (listener_oafiid, "IDL:Bonobo/Listener:1.0", ev);
|
||||
g_free (listener_oafiid);
|
||||
|
||||
if (BONOBO_EX (ev)) {
|
||||
listener = CORBA_OBJECT_NIL;
|
||||
CORBA_exception_init (ev);
|
||||
}
|
||||
|
||||
#endif /* Disabled */
|
||||
|
||||
arg = bonobo_arg_new (BONOBO_ARG_NULL);
|
||||
bonobo_event_source_notify_listeners (archiver_db->es, "Bonobo/ConfigDatabase:sync", arg, ev);
|
||||
bonobo_arg_release (arg);
|
||||
|
||||
#if 0 /* Disabled now to be safe */
|
||||
if (listener != CORBA_OBJECT_NIL)
|
||||
bonobo_object_release_unref (listener, NULL);
|
||||
#endif /* Disabled */
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
<oaf_info>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_background_properties_Factory" type="exe" location="REPLACEME_PLIZ">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:GNOME/ObjectFactory:1.0"/>
|
||||
</oaf_attribute>
|
||||
|
||||
<oaf_attribute name="name" type="string" value="Background properties capplet factory"/>
|
||||
</oaf_server>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_background_properties" type="factory"
|
||||
location="OAFIID:Bonobo_Control_Capplet_background_properties_Factory">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:Bonobo/PropertyControl:1.0"/>
|
||||
<item value="IDL:Bonobo/Unknown:1.0"/>
|
||||
</oaf_attribute>
|
||||
<oaf_attribute name="name" type="string" value="Background properties capplet"/>
|
||||
</oaf_server>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Listener_background_properties" type="factory"
|
||||
location="OAFIID:Bonobo_Control_Capplet_background_properties_Factory">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:Bonobo/Listener:1.0"/>
|
||||
<item value="IDL:Bonobo/Unknown:1.0"/>
|
||||
</oaf_attribute>
|
||||
<oaf_attribute name="name" type="string" value="Listener for changes to background properties"/>
|
||||
</oaf_server>
|
||||
|
||||
</oaf_info>
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
2001-10-12 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am ($(oaffile)): Make creation of the .oaf file generic
|
||||
|
||||
* applier.c (render_to_screen): Use standard gdk and gdk_pixbuf
|
||||
rather than xlib and gdk_pixbuf_xlib
|
||||
(make_root_pixmap): Create a GdkPixmap
|
||||
|
|
|
|||
|
|
@ -22,9 +22,6 @@ oafdir = $(datadir)/oaf
|
|||
oaf_DATA = Bonobo_Control_Capplet_background_properties.oaf
|
||||
oaffile = $(oaf_DATA)
|
||||
|
||||
$(oaffile): %.oaf: %.oaf.in
|
||||
sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
|
||||
##
|
||||
## You should not need to modify anything below this line
|
||||
##
|
||||
|
|
@ -34,6 +31,9 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
|
|||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
|
||||
chmod a+x $@
|
||||
|
||||
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
|
||||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
|
||||
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
$(desktop).in: %.desktop.in: %.desktop.in.in
|
||||
sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
|
||||
|
|
|
|||
30
capplets/common/Bonobo_Control_Capplet_generic.oaf.in
Normal file
30
capplets/common/Bonobo_Control_Capplet_generic.oaf.in
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
<oaf_info>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_@SHORT_CAPPLET_NAME@_properties_Factory" type="exe"
|
||||
location="@BINDIR@/@CAPPLET_BINARY_NAME@">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:GNOME/ObjectFactory:1.0"/>
|
||||
</oaf_attribute>
|
||||
|
||||
<oaf_attribute name="name" type="string" value="@SHORT_CAPPLET_NAME@ properties capplet factory"/>
|
||||
</oaf_server>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_@SHORT_CAPPLET_NAME@_properties" type="factory"
|
||||
location="OAFIID:Bonobo_@SHORT_CAPPLET_NAME@_properties_Factory">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:Bonobo/PropertyControl:1.0"/>
|
||||
<item value="IDL:Bonobo/Unknown:1.0"/>
|
||||
</oaf_attribute>
|
||||
<oaf_attribute name="name" type="string" value="@SHORT_CAPPLET_NAME@ capplet"/>
|
||||
</oaf_server>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Listener_@SHORT_CAPPLET_NAME@" type="factory"
|
||||
location="OAFIID:Bonobo_@SHORT_CAPPLET_NAME@_properties_Factory">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:Bonobo/Listener:1.0"/>
|
||||
<item value="IDL:Bonobo/Unknown:1.0"/>
|
||||
</oaf_attribute>
|
||||
<oaf_attribute name="name" type="string" value="Listener for changes to @SHORT_CAPPLET_NAME@ properties"/>
|
||||
</oaf_server>
|
||||
|
||||
</oaf_info>
|
||||
|
|
@ -1,3 +1,21 @@
|
|||
2001-10-12 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* capplet-util.c (get_factory_name): Updated factory name to
|
||||
reflect new, expanded roles
|
||||
|
||||
* Bonobo_Control_Capplet_generic.oaf.in: Create
|
||||
|
||||
2001-09-29 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* capplet-util.c (create_control_cb): Elimite reference counter --
|
||||
it's not necessary
|
||||
(create_control_cb): Make this a multi-factory so that we can
|
||||
return the listener when needed
|
||||
(capplet_init): Set up the listener here rather than in
|
||||
get_control_cb; also remove the listener and unref the database
|
||||
here
|
||||
(quit_cb, real_quit_cb): Remove (thank the gods)
|
||||
|
||||
2001-09-28 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* capplet-util.c (get_default_moniker): Remove -control from the
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
EXTRA_DIST = ChangeLog wrapper-script.in
|
||||
EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in
|
||||
|
||||
INCLUDES = \
|
||||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||
|
|
|
|||
|
|
@ -34,17 +34,12 @@
|
|||
|
||||
#include "capplet-util.h"
|
||||
|
||||
static CreateDialogFn create_dialog_cb = NULL;
|
||||
static ApplySettingsFn apply_settings_cb = NULL;
|
||||
static SetupPropertyEditorsFn setup_cb = NULL;
|
||||
static CreateDialogFn create_dialog_cb = NULL;
|
||||
static ApplySettingsFn apply_settings_cb = NULL;
|
||||
static SetupPropertyEditorsFn setup_cb = NULL;
|
||||
|
||||
typedef struct _pair_t pair_t;
|
||||
|
||||
struct _pair_t
|
||||
{
|
||||
gpointer a;
|
||||
gpointer b;
|
||||
};
|
||||
static BonoboListener *listener = NULL;
|
||||
static Bonobo_EventSource_ListenerId listener_id;
|
||||
|
||||
/* apply_cb
|
||||
*
|
||||
|
|
@ -214,98 +209,38 @@ get_control_cb (BonoboPropertyControl *property_control, gint page_number)
|
|||
return BONOBO_OBJECT (control);
|
||||
}
|
||||
|
||||
/* real_quit_cb
|
||||
*
|
||||
* Release all objects and close down
|
||||
*/
|
||||
|
||||
static gint
|
||||
real_quit_cb (pair_t *pair)
|
||||
{
|
||||
CORBA_Environment ev;
|
||||
Bonobo_EventSource_ListenerId id;
|
||||
Bonobo_ConfigDatabase db;
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
db = (Bonobo_ConfigDatabase) pair->a;
|
||||
id = (Bonobo_EventSource_ListenerId) pair->b;
|
||||
|
||||
DEBUG_MSG ("Removing event source...");
|
||||
bonobo_event_source_client_remove_listener (db, id, &ev);
|
||||
DEBUG_MSG ("Releasing db object...");
|
||||
bonobo_object_release_unref (db, &ev);
|
||||
DEBUG_MSG ("Done releasing db object...");
|
||||
|
||||
CORBA_exception_free (&ev);
|
||||
|
||||
g_free (pair);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
quit_cb (BonoboPropertyControl *pc, pair_t *pair)
|
||||
{
|
||||
GtkObject *ref_obj = pair->b;
|
||||
|
||||
pair->b = gtk_object_get_data (GTK_OBJECT (pc), "listener-id");
|
||||
|
||||
gtk_idle_add ((GtkFunction)real_quit_cb, pair);
|
||||
gtk_object_unref (ref_obj);
|
||||
}
|
||||
|
||||
static void
|
||||
all_done_cb (void)
|
||||
{
|
||||
gtk_idle_add ((GtkFunction) gtk_main_quit, NULL);
|
||||
}
|
||||
|
||||
/* create_control_cb
|
||||
*
|
||||
* Small function to create the PropertyControl and return it.
|
||||
*/
|
||||
|
||||
static BonoboObject *
|
||||
create_control_cb (BonoboGenericFactory *factory, gchar *default_moniker)
|
||||
create_control_cb (BonoboGenericFactory *factory, const gchar *component_id, gchar *default_moniker)
|
||||
{
|
||||
BonoboObject *obj;
|
||||
BonoboPropertyControl *property_control;
|
||||
CORBA_Environment ev;
|
||||
Bonobo_EventSource_ListenerId id;
|
||||
Bonobo_ConfigDatabase db;
|
||||
pair_t *pair;
|
||||
|
||||
static GtkObject *ref_obj = NULL;
|
||||
static const gchar *prefix1 = "OAFIID:Bonobo_Control_Capplet_";
|
||||
static const gchar *prefix2 = "OAFIID:Bonobo_Listener_Capplet_";
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
g_message ("%s: Enter", __FUNCTION__);
|
||||
|
||||
property_control = bonobo_property_control_new
|
||||
((BonoboPropertyControlGetControlFn) get_control_cb, 1, NULL);
|
||||
gtk_signal_connect (GTK_OBJECT (property_control), "action",
|
||||
GTK_SIGNAL_FUNC (apply_cb), NULL);
|
||||
|
||||
db = bonobo_get_object (default_moniker, "IDL:Bonobo/ConfigDatabase:1.0", &ev);
|
||||
id = bonobo_event_source_client_add_listener
|
||||
(db, (BonoboListenerCallbackFn) changed_cb,
|
||||
"Bonobo/ConfigDatabase:sync", &ev, db);
|
||||
gtk_object_set_data (GTK_OBJECT (property_control), "listener-id", (gpointer) id);
|
||||
|
||||
CORBA_exception_free (&ev);
|
||||
|
||||
if (ref_obj == NULL) {
|
||||
ref_obj = gtk_object_new (gtk_object_get_type (), NULL);
|
||||
gtk_signal_connect (ref_obj, "destroy", GTK_SIGNAL_FUNC (all_done_cb), NULL);
|
||||
if (!strncmp (component_id, prefix1, strlen (prefix1))) {
|
||||
property_control = bonobo_property_control_new
|
||||
((BonoboPropertyControlGetControlFn) get_control_cb, 1, NULL);
|
||||
gtk_signal_connect (GTK_OBJECT (property_control), "action",
|
||||
GTK_SIGNAL_FUNC (apply_cb), NULL);
|
||||
obj = BONOBO_OBJECT (property_control);
|
||||
}
|
||||
else if (!strncmp (component_id, prefix2, strlen (prefix2))) {
|
||||
obj = BONOBO_OBJECT (listener);
|
||||
bonobo_object_ref (obj);
|
||||
} else {
|
||||
gtk_object_ref (ref_obj);
|
||||
g_critical ("Not creating %s", component_id);
|
||||
obj = NULL;
|
||||
}
|
||||
|
||||
pair = g_new (pair_t, 1);
|
||||
pair->a = db;
|
||||
pair->b = ref_obj;
|
||||
gtk_signal_connect (GTK_OBJECT (property_control), "destroy",
|
||||
GTK_SIGNAL_FUNC (quit_cb), pair);
|
||||
|
||||
return BONOBO_OBJECT (property_control);
|
||||
return obj;
|
||||
}
|
||||
|
||||
/* get_factory_name
|
||||
|
|
@ -326,7 +261,7 @@ get_factory_name (const gchar *binary)
|
|||
if ((tmp1 = strstr (tmp, "-capplet")) != NULL) *tmp1 = '\0';
|
||||
while ((tmp1 = strchr (tmp, '-')) != NULL) *tmp1 = '_';
|
||||
|
||||
res = g_strconcat ("OAFIID:Bonobo_Control_Capplet_", tmp, "_Factory", NULL);
|
||||
res = g_strconcat ("OAFIID:Bonobo_", tmp, "_Factory", NULL);
|
||||
g_free (s);
|
||||
return res;
|
||||
}
|
||||
|
|
@ -477,6 +412,39 @@ legacy_is_modified (Bonobo_ConfigDatabase db, const gchar *filename)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
add_listener_cb (Bonobo_ConfigDatabase db)
|
||||
{
|
||||
Bonobo_EventSource es;
|
||||
CORBA_Environment ev;
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
|
||||
/* We do this manually so that we have access to the resulting listener object */
|
||||
es = Bonobo_Unknown_queryInterface (db, "IDL:Bonobo/EventSource:1.0", &ev);
|
||||
|
||||
if (BONOBO_EX (&ev) || es == CORBA_OBJECT_NIL) {
|
||||
g_critical ("Cannot get event source interface (%s)",
|
||||
bonobo_exception_get_text (&ev));
|
||||
} else {
|
||||
listener = bonobo_listener_new ((BonoboListenerCallbackFn) changed_cb, db);
|
||||
listener_id = Bonobo_EventSource_addListenerWithMask (es, BONOBO_OBJREF (listener),
|
||||
"Bonobo/ConfigDatabase:sync", &ev);
|
||||
|
||||
if (BONOBO_EX (&ev) || listener_id == 0) {
|
||||
g_critical ("Could not add the listener to the event source (%s)",
|
||||
bonobo_exception_get_text (&ev));
|
||||
}
|
||||
|
||||
bonobo_object_release_unref (es, NULL);
|
||||
bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (listener));
|
||||
}
|
||||
|
||||
CORBA_exception_free (&ev);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* capplet_init -- see documentation in capplet-util.h
|
||||
*/
|
||||
|
||||
|
|
@ -489,14 +457,17 @@ capplet_init (int argc,
|
|||
SetupPropertyEditorsFn setup_fn,
|
||||
GetLegacySettingsFn get_legacy_fn)
|
||||
{
|
||||
BonoboGenericFactory *factory;
|
||||
Bonobo_ConfigDatabase db;
|
||||
CORBA_ORB orb;
|
||||
CORBA_Environment ev;
|
||||
gchar *factory_iid;
|
||||
gchar *default_moniker;
|
||||
gboolean needs_legacy = FALSE;
|
||||
int i;
|
||||
gchar *factory_iid;
|
||||
gchar *default_moniker;
|
||||
gboolean needs_legacy = FALSE;
|
||||
int i;
|
||||
|
||||
BonoboGenericFactory *factory;
|
||||
|
||||
CORBA_ORB orb;
|
||||
Bonobo_ConfigDatabase db;
|
||||
|
||||
CORBA_Environment ev;
|
||||
|
||||
static gboolean apply_only;
|
||||
static gboolean init_session;
|
||||
|
|
@ -560,17 +531,25 @@ capplet_init (int argc,
|
|||
apply_settings_cb = apply_fn;
|
||||
setup_cb = setup_fn;
|
||||
factory_iid = get_factory_name (argv[0]);
|
||||
factory = bonobo_generic_factory_new
|
||||
(factory_iid, (BonoboGenericFactoryFn) create_control_cb, default_moniker);
|
||||
factory = bonobo_generic_factory_new_multi
|
||||
(factory_iid, (GnomeFactoryCallback) create_control_cb, default_moniker);
|
||||
g_free (factory_iid);
|
||||
bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
|
||||
|
||||
gtk_idle_add ((GtkFunction) add_listener_cb, db);
|
||||
|
||||
bonobo_main ();
|
||||
|
||||
if (listener_id != 0) {
|
||||
bonobo_event_source_client_remove_listener (db, listener_id, &ev);
|
||||
|
||||
if (BONOBO_EX (&ev))
|
||||
g_critical ("Could not remove listener (%s)", bonobo_exception_get_text (&ev));
|
||||
}
|
||||
}
|
||||
|
||||
g_free (default_moniker);
|
||||
DEBUG_MSG ("Releasing final db object...");
|
||||
bonobo_object_release_unref (db, &ev);
|
||||
DEBUG_MSG ("Done releasing final db object...");
|
||||
bonobo_object_release_unref (db, NULL);
|
||||
|
||||
CORBA_exception_free (&ev);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* -*- mode: c; style: linux -*- */
|
||||
|
||||
/* capplet-util.c
|
||||
/* capplet-util.h
|
||||
* Copyright (C) 2001 Ximian, Inc.
|
||||
*
|
||||
* Written by Bradford Hovinen <hovinen@ximian.com>
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
<oaf_info>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_keyboard_properties_Factory" type="exe" location="REPLACEME_PLIZ">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:GNOME/ObjectFactory:1.0"/>
|
||||
</oaf_attribute>
|
||||
|
||||
<oaf_attribute name="name" type="string" value="Keyboard properties capplet factory"/>
|
||||
</oaf_server>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_keyboard_properties" type="factory"
|
||||
location="OAFIID:Bonobo_Control_Capplet_keyboard_properties_Factory">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:Bonobo/PropertyControl:1.0"/>
|
||||
<item value="IDL:Bonobo/Unknown:1.0"/>
|
||||
</oaf_attribute>
|
||||
<oaf_attribute name="name" type="string" value="Keyboard properties capplet"/>
|
||||
</oaf_server>
|
||||
|
||||
</oaf_info>
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
2001-10-12 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am: Make OAF file creation generic
|
||||
|
||||
2001-09-28 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am: Remove support for disabling bonobo-conf build
|
||||
|
|
|
|||
|
|
@ -17,9 +17,7 @@ defaults_DATA = keyboard-properties.xml
|
|||
|
||||
oafdir = $(datadir)/oaf
|
||||
oaf_DATA = Bonobo_Control_Capplet_keyboard_properties.oaf
|
||||
|
||||
$(oaffile): %.oaf: %.oaf.in
|
||||
sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
oaffile = $(oaf_DATA)
|
||||
|
||||
##
|
||||
## You should not need to modify anything below this line
|
||||
|
|
@ -30,6 +28,9 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
|
|||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
|
||||
chmod a+x $@
|
||||
|
||||
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
|
||||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
|
||||
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
$(desktop).in: %.desktop.in: %.desktop.in.in
|
||||
sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
<oaf_info>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_mouse_properties_Factory" type="exe" location="REPLACEME_PLIZ">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:GNOME/ObjectFactory:1.0"/>
|
||||
</oaf_attribute>
|
||||
|
||||
<oaf_attribute name="name" type="string" value="Mouse properties capplet factory"/>
|
||||
</oaf_server>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_mouse_properties" type="factory"
|
||||
location="OAFIID:Bonobo_Control_Capplet_mouse_properties_Factory">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:Bonobo/PropertyControl:1.0"/>
|
||||
<item value="IDL:Bonobo/Unknown:1.0"/>
|
||||
</oaf_attribute>
|
||||
|
||||
<oaf_attribute name="name" type="string" value="Mouse properties capplet"/>
|
||||
</oaf_server>
|
||||
|
||||
</oaf_info>
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
2001-10-12 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am: Make OAF file creation generic
|
||||
|
||||
2001-09-28 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am: Remove support for disabling bonobo-conf build
|
||||
|
|
|
|||
|
|
@ -17,9 +17,7 @@ defaults_DATA = mouse-properties.xml
|
|||
|
||||
oafdir = $(datadir)/oaf
|
||||
oaf_DATA = Bonobo_Control_Capplet_mouse_properties.oaf
|
||||
|
||||
$(oaffile): %.oaf: %.oaf.in
|
||||
sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
oaffile = $(oaf_DATA)
|
||||
|
||||
##
|
||||
## You should not need to modify anything below this line
|
||||
|
|
@ -30,6 +28,9 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
|
|||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
|
||||
chmod a+x $@
|
||||
|
||||
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
|
||||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
|
||||
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
$(desktop).in: %.desktop.in: %.desktop.in.in
|
||||
sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
<oaf_info>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_sound_properties_Factory" type="exe"
|
||||
location="REPLACEME_PLIZ">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:GNOME/ObjectFactory:1.0"/>
|
||||
</oaf_attribute>
|
||||
|
||||
<oaf_attribute name="name" type="string" value="Sound properties capplet factory"/>
|
||||
</oaf_server>
|
||||
|
||||
<oaf_server iid="OAFIID:Bonobo_Control_Capplet_sound_properties" type="factory"
|
||||
location="OAFIID:Bonobo_Control_Capplet_sound_properties_Factory">
|
||||
<oaf_attribute name="repo_ids" type="stringv">
|
||||
<item value="IDL:Bonobo/PropertyControl:1.0"/>
|
||||
<item value="IDL:Bonobo/Unknown:1.0"/>
|
||||
</oaf_attribute>
|
||||
|
||||
<oaf_attribute name="name" type="string" value="Sound properties capplet"/>
|
||||
</oaf_server>
|
||||
|
||||
</oaf_info>
|
||||
|
|
@ -1,3 +1,7 @@
|
|||
2001-10-12 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am: Make OAF file creation generic
|
||||
|
||||
2001-09-28 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* Makefile.am: Remove support for disabling bonobo-conf build
|
||||
|
|
|
|||
|
|
@ -23,9 +23,6 @@ oafdir = $(datadir)/oaf
|
|||
oaf_DATA = Bonobo_Control_Capplet_sound_properties.oaf
|
||||
oaffile = $(oaf_DATA)
|
||||
|
||||
$(oaffile): %.oaf: %.oaf.in
|
||||
sed -e "s#REPLACEME_PLIZ#$(bindir)/$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
|
||||
##
|
||||
## You should not need to modify anything below this line
|
||||
##
|
||||
|
|
@ -35,6 +32,9 @@ $(bin_SCRIPTS): $(top_srcdir)/capplets/common/wrapper-script.in
|
|||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@CAPPLET_NAME@#$(cappletname)-properties#" < $< > $@
|
||||
chmod a+x $@
|
||||
|
||||
$(oaffile): %.oaf: $(top_srcdir)/capplets/common/Bonobo_Control_Capplet_generic.oaf.in
|
||||
sed -e "s#@BINDIR@#$(bindir)#" -e "s#@SHORT_CAPPLET_NAME@#$(cappletname)#" -e "s#@CAPPLET_BINARY_NAME@#$(bin_PROGRAMS)#" < $< > ${oaffile}
|
||||
|
||||
####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
|
||||
$(desktop).in: %.desktop.in: %.desktop.in.in
|
||||
sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2001-10-12 Bradford Hovinen <hovinen@ximian.com>
|
||||
|
||||
* capplet-dir.c (capplet_control_launch): Unref the property bag
|
||||
when we are done
|
||||
|
||||
2001-09-28 Carlos Perelló Marín <carlos@gnome-db.org>
|
||||
|
||||
* capplet-dir-view-html.c: Now we use utf-8 strings
|
||||
|
|
|
|||
|
|
@ -515,6 +515,7 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title)
|
|||
cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (control));
|
||||
pb = bonobo_control_frame_get_control_property_bag (cf, &ev);
|
||||
bonobo_property_bag_client_set_value_string (pb, "moniker", moniker, &ev);
|
||||
bonobo_object_release_unref (pb, NULL);
|
||||
|
||||
if (BONOBO_EX (&ev)) {
|
||||
dialog = gnome_error_dialog ("Could not load your configuration settings.");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue