libbonobo patch



Just committed the following patch:
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonobo/ChangeLog,v
retrieving revision 1.56
diff -u -r1.56 ChangeLog
--- ChangeLog   2001/06/30 19:53:29     1.56
+++ ChangeLog   2001/07/02 12:49:46
@@ -1,3 +1,21 @@
+2001-07-02  Dietmar Maurer  <dietmar ximian com>
+
+       * bonobo/bonobo-shlib-factory.c (bonobo_shlib_factory_track_object):
+       s/g_signal_connectc/g_signal_connect/ 
+
+       * bonobo/bonobo-running-context.c (bonobo_running_context_class_init): 
+       s/g_signal_newc/g_signal_new/ s/g_signal_connectc/g_signal_connect/
+
+       * bonobo/bonobo-listener.c (bonobo_listener_class_init):  
+       s/g_signal_newc/g_signal_new/
+
+       * bonobo/bonobo-item-container.c: s/g_signal_newc/g_signal_new/
+
+       * idl/Bonobo_Property.idl: added flags to addDatabase
+
+       * bonobo/bonobo-object.c: s/shutdown/dispose/ 
+       s/g_signal_newc/g_signal_new/
+
 Sat Jun 30 14:53:52 2001  Jonathan Blandford  <jrb redhat com>
 
        * tests/test-properties-server.c (main): Change to reflect new
Index: bonobo/bonobo-item-container.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo/bonobo-item-container.c,v
retrieving revision 1.55
diff -u -r1.55 bonobo-item-container.c
--- bonobo/bonobo-item-container.c      2001/04/18 22:09:06     1.55
+++ bonobo/bonobo-item-container.c      2001/07/02 12:49:46
@@ -152,15 +152,15 @@
        object_class->finalize = bonobo_item_container_finalize;
 
        signals [GET_OBJECT] =
-               g_signal_newc  ("get_object",
-                               G_TYPE_FROM_CLASS (object_class),
-                               G_SIGNAL_RUN_LAST,
-                               0,
-                               NULL, NULL,
-                               bonobo_marshal_POINTER__POINTER_BOOLEAN_POINTER,
-                               G_TYPE_POINTER,
-                               3,
-                               G_TYPE_POINTER, G_TYPE_BOOLEAN, G_TYPE_POINTER);
+               g_signal_new  ("get_object",
+                              G_TYPE_FROM_CLASS (object_class),
+                              G_SIGNAL_RUN_LAST,
+                              0,
+                              NULL, NULL,
+                              bonobo_marshal_POINTER__POINTER_BOOLEAN_POINTER,
+                              G_TYPE_POINTER,
+                              3,
+                              G_TYPE_POINTER, G_TYPE_BOOLEAN, G_TYPE_POINTER);
 
        epv->enumObjects     = impl_Bonobo_ItemContainer_enumObjects;
        epv->getObjectByName = impl_Bonobo_ItemContainer_getObjectByName;
Index: bonobo/bonobo-listener.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo/bonobo-listener.c,v
retrieving revision 1.20
diff -u -r1.20 bonobo-listener.c
--- bonobo/bonobo-listener.c    2001/04/18 22:09:06     1.20
+++ bonobo/bonobo-listener.c    2001/07/02 12:49:46
@@ -74,7 +74,7 @@
 
        oclass->finalize = bonobo_listener_finalize;
 
-       signals [EVENT_NOTIFY] = g_signal_newc (
+       signals [EVENT_NOTIFY] = g_signal_new (
                "event_notify", G_TYPE_FROM_CLASS (oclass), G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (BonoboListenerClass, event_notify),
                NULL, NULL,
Index: bonobo/bonobo-object.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo/bonobo-object.c,v
retrieving revision 1.110
diff -u -r1.110 bonobo-object.c
--- bonobo/bonobo-object.c      2001/06/26 16:43:32     1.110
+++ bonobo/bonobo-object.c      2001/07/02 12:49:46
@@ -97,7 +97,7 @@
 
                if (o->ref_count >= 1) {
                        g_object_ref (o);
-                       G_OBJECT_GET_CLASS (o)->shutdown (o);
+                       G_OBJECT_GET_CLASS (o)->dispose (o);
                        g_object_unref (o);
                } else
                        g_warning ("Serious ref-counting error [%p]", o);
@@ -516,11 +516,11 @@
 }
 
 static void
-bonobo_object_shutdown (GObject *gobject)
+bonobo_object_dispose (GObject *gobject)
 {
        g_signal_emit (gobject, bonobo_object_signals [DESTROY], 0);
 
-       bonobo_object_parent_class->shutdown (gobject);
+       bonobo_object_parent_class->dispose (gobject);
 }
 
 static void
@@ -572,31 +572,31 @@
        bonobo_object_parent_class = g_type_class_peek_parent (klass);
 
        bonobo_object_signals [DESTROY] =
-               g_signal_newc ("destroy",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (BonoboObjectClass,destroy),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE, 0);
+               g_signal_new ("destroy",
+                             G_TYPE_FROM_CLASS (object_class),
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (BonoboObjectClass,destroy),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
        bonobo_object_signals [QUERY_INTERFACE] =
-               g_signal_newc ("query_interface",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (BonoboObjectClass,query_interface),
-                              NULL, NULL,
-                              bonobo_marshal_VOID__POINTER_POINTER,
-                              G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+               g_signal_new ("query_interface",
+                             G_TYPE_FROM_CLASS (object_class),
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (BonoboObjectClass,query_interface),
+                             NULL, NULL,
+                             bonobo_marshal_VOID__POINTER_POINTER,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
        bonobo_object_signals [SYSTEM_EXCEPTION] =
-               g_signal_newc ("system_exception",
-                              G_TYPE_FROM_CLASS (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (BonoboObjectClass,system_exception),
-                              NULL, NULL,
-                              bonobo_marshal_VOID__POINTER_POINTER,
-                              G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+               g_signal_new ("system_exception",
+                             G_TYPE_FROM_CLASS (object_class),
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (BonoboObjectClass,system_exception),
+                             NULL, NULL,
+                             bonobo_marshal_VOID__POINTER_POINTER,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
-       object_class->shutdown = bonobo_object_shutdown;
+       object_class->dispose = bonobo_object_dispose;
        object_class->finalize = bonobo_object_finalize_real;
 }
 
Index: bonobo/bonobo-running-context.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo/bonobo-running-context.c,v
retrieving revision 1.19
diff -u -r1.19 bonobo-running-context.c
--- bonobo/bonobo-running-context.c     2001/06/27 23:40:03     1.19
+++ bonobo/bonobo-running-context.c     2001/07/02 12:49:46
@@ -324,7 +324,7 @@
 
        ((BonoboRunningContextClass *)klass)->last_unref = NULL;
 
-       signals [LAST_UNREF] = g_signal_newc (
+       signals [LAST_UNREF] = g_signal_new (
                "last_unref", G_TYPE_FROM_CLASS (object_class),
                G_SIGNAL_RUN_FIRST,
                G_STRUCT_OFFSET (BonoboRunningContextClass, last_unref),
@@ -369,8 +369,8 @@
        bonobo_object_add_interface (BONOBO_OBJECT (bonobo_running_context),
                                     BONOBO_OBJECT (bonobo_running_event_source));
 
-       g_signal_connectc (G_OBJECT (bonobo_running_context),
-                          "destroy", G_CALLBACK (check_destroy), NULL, FALSE);
+       g_signal_connect (G_OBJECT (bonobo_running_context),
+                         "destroy", G_CALLBACK (check_destroy), NULL);
 
        return bonobo_running_context;
 }
@@ -401,9 +401,9 @@
        bonobo_running_context_ignore_object (obj_dup);
 
        if (bonobo_running_context)
-               g_signal_connectc (G_OBJECT (bonobo_running_context),
-                                  "last_unref", G_CALLBACK (last_unref_cb),
-                                  obj_dup, FALSE);
+               g_signal_connect (G_OBJECT (bonobo_running_context),
+                                 "last_unref", G_CALLBACK (last_unref_cb),
+                                 obj_dup);
        
        CORBA_exception_free (&ev);
 }
@@ -425,10 +425,10 @@
        bonobo_running_context_ignore_object (BONOBO_OBJREF (object));
 
        if (bonobo_running_context)
-               g_signal_connectc (G_OBJECT (bonobo_running_context),
-                                  "last_unref",
-                                  G_CALLBACK (last_unref_exit_cb),
-                                  object, FALSE);
+               g_signal_connect (G_OBJECT (bonobo_running_context),
+                                 "last_unref",
+                                 G_CALLBACK (last_unref_exit_cb),
+                                 object);
 
 }
 
Index: bonobo/bonobo-shlib-factory.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo/bonobo-shlib-factory.c,v
retrieving revision 1.8
diff -u -r1.8 bonobo-shlib-factory.c
--- bonobo/bonobo-shlib-factory.c       2001/04/23 14:48:34     1.8
+++ bonobo/bonobo-shlib-factory.c       2001/07/02 12:49:46
@@ -278,7 +278,7 @@
 
        bonobo_shlib_factory_inc_live (factory);
 
-       g_signal_connectc (G_OBJECT (object), "destroy",
-                          G_CALLBACK (destroy_handler),
-                          factory, FALSE);
+       g_signal_connect (G_OBJECT (object), "destroy",
+                         G_CALLBACK (destroy_handler),
+                         factory);
 }
Index: idl/Bonobo_Property.idl
===================================================================
RCS file: /cvs/gnome/libbonobo/idl/Bonobo_Property.idl,v
retrieving revision 1.23
diff -u -r1.23 Bonobo_Property.idl
--- idl/Bonobo_Property.idl     2001/06/06 13:37:21     1.23
+++ idl/Bonobo_Property.idl     2001/07/02 12:49:46
@@ -143,6 +143,12 @@
 
 interface ConfigDatabase : PropertyBag {
 
+       enum DBFlags {
+               DEFAULT,
+               WRITE,
+               MANDATORY
+       };
+
        /** 
         * isWriteable:
         * 
@@ -187,8 +193,8 @@
         * 
         * The added database will be used to lookup default values.
         */
-       void            addDatabase (in ConfigDatabase default_db, 
-                                    in string path)
+       void            addDatabase (in ConfigDatabase db, in string key, 
+                                    in DBFlags flags)
                raises (BackendFailed);
 
        /** 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]