[maemo-commits] [maemo-commits] r12780 - in projects/haf/trunk/dbus-glib: . debian debian/patches
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Jul 23 14:50:05 EEST 2007
- Previous message: [maemo-commits] r12779 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Next message: [maemo-commits] r12781 - projects/haf/trunk/hail
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kihamala Date: 2007-07-23 14:49:59 +0300 (Mon, 23 Jul 2007) New Revision: 12780 Added: projects/haf/trunk/dbus-glib/dbus-glib-0.74.tar.gz Removed: projects/haf/trunk/dbus-glib/dbus-glib-0.73.tar.gz projects/haf/trunk/dbus-glib/debian/patches/03-allow-wshadow.patch projects/haf/trunk/dbus-glib/debian/patches/08-add_dbus_connection_get_g_connection.patch projects/haf/trunk/dbus-glib/debian/patches/09-support-peer-to-peer-proxies.patch Modified: projects/haf/trunk/dbus-glib/debian/changelog projects/haf/trunk/dbus-glib/debian/rules Log: new upstream tarball Deleted: projects/haf/trunk/dbus-glib/dbus-glib-0.73.tar.gz =================================================================== (Binary files differ) Added: projects/haf/trunk/dbus-glib/dbus-glib-0.74.tar.gz =================================================================== (Binary files differ) Property changes on: projects/haf/trunk/dbus-glib/dbus-glib-0.74.tar.gz ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: projects/haf/trunk/dbus-glib/debian/changelog =================================================================== --- projects/haf/trunk/dbus-glib/debian/changelog 2007-07-23 11:32:10 UTC (rev 12779) +++ projects/haf/trunk/dbus-glib/debian/changelog 2007-07-23 11:49:59 UTC (rev 12780) @@ -1,3 +1,14 @@ +dbus-glib (0.74-0osso1) experimental; urgency=low + + * UNRELEASED + * New upstream tarball. + * Removed patches included in the new tarball: + 03-allow-wshadow.patch + 08-add_dbus_connection_get_g_connection.patch + 09-support-peer-to-peer-proxies.patch + + -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> Mon, 23 Jul 2007 14:46:47 +0300 + dbus-glib (0.73-0osso2) experimental; urgency=low * Added two patches from Ross Burton: one to add Deleted: projects/haf/trunk/dbus-glib/debian/patches/03-allow-wshadow.patch =================================================================== --- projects/haf/trunk/dbus-glib/debian/patches/03-allow-wshadow.patch 2007-07-23 11:32:10 UTC (rev 12779) +++ projects/haf/trunk/dbus-glib/debian/patches/03-allow-wshadow.patch 2007-07-23 11:49:59 UTC (rev 12780) @@ -1,25 +0,0 @@ -diff -ur dbus/dbus-gtype-specialized.h dbus.new/glib/dbus-gtype-specialized.h ---- dbus/dbus-gtype-specialized.h 2006-05-05 18:59:24.000000000 +0300 -+++ dbus.new/dbus-gtype-specialized.h 2006-09-05 16:45:15.521607040 +0300 -@@ -47,7 +47,7 @@ - GType dbus_g_type_get_map_key_specialization (GType gtype); - GType dbus_g_type_get_map_value_specialization (GType gtype); - GType dbus_g_type_get_struct_member_type (GType gtype, -- guint index); -+ guint idx); - guint dbus_g_type_get_struct_size (GType gtype); - - typedef void (*DBusGTypeSpecializedCollectionIterator) (const GValue *val, -@@ -92,10 +92,10 @@ - gpointer user_data); - - gboolean dbus_g_type_struct_get_member (const GValue *value, -- guint index, -+ guint idx, - GValue *dest); - gboolean dbus_g_type_struct_set_member (GValue *value, -- guint index, -+ guint idx, - const GValue *src); - - gboolean dbus_g_type_struct_get (const GValue *value, Deleted: projects/haf/trunk/dbus-glib/debian/patches/08-add_dbus_connection_get_g_connection.patch =================================================================== --- projects/haf/trunk/dbus-glib/debian/patches/08-add_dbus_connection_get_g_connection.patch 2007-07-23 11:32:10 UTC (rev 12779) +++ projects/haf/trunk/dbus-glib/debian/patches/08-add_dbus_connection_get_g_connection.patch 2007-07-23 11:49:59 UTC (rev 12780) @@ -1,94 +0,0 @@ ---- a/dbus/dbus-glib-lowlevel.h -+++ b/dbus/dbus-glib-lowlevel.h -@@ -49,6 +49,7 @@ void dbus_g_proxy_send (DBusGProxy *p - dbus_uint32_t *client_serial); - - DBusConnection* dbus_g_connection_get_connection (DBusGConnection *gconnection); -+DBusGConnection* dbus_connection_get_g_connection (DBusConnection *connection); - DBusMessage* dbus_g_message_get_message (DBusGMessage *gmessage); - - /* dbus_g_pending_call_get_pending_call() deliberately skipped for now; ---- a/dbus/dbus-glib.c -+++ b/dbus/dbus-glib.c -@@ -305,9 +305,33 @@ dbus_g_message_get_g_type (void) - DBusConnection* - dbus_g_connection_get_connection (DBusGConnection *gconnection) - { -+ g_return_val_if_fail (gconnection, NULL); - return DBUS_CONNECTION_FROM_G_CONNECTION (gconnection); - } - -+extern dbus_int32_t _dbus_gmain_connection_slot; -+ -+/** -+ * dbus_connection_get_g_connection: -+ * @connection: a #DBusConnection -+ * -+ * Get the #DBusGConnection corresponding to this #DBusConnection. This only -+ * makes sense if the #DBusConnection was originally a #DBusGConnection that was -+ * registered with the GLib main loop. The return value does not have its -+ * refcount incremented. -+ * -+ * Returns: #DBusGConnection -+ */ -+DBusGConnection* -+dbus_connection_get_g_connection (DBusConnection *connection) -+{ -+ g_return_val_if_fail (connection, NULL); -+ g_return_val_if_fail (dbus_connection_get_data (connection, _dbus_gmain_connection_slot), NULL); -+ -+ return DBUS_G_CONNECTION_FROM_CONNECTION (connection); -+} -+ -+ - /** - * dbus_g_message_get_message: - * @gmessage: a #DBusGMessage ---- a/dbus/dbus-gmain.c -+++ b/dbus/dbus-gmain.c -@@ -129,7 +129,7 @@ typedef struct - DBusTimeout *timeout; - } TimeoutHandler; - --static dbus_int32_t connection_slot = -1; -+dbus_int32_t _dbus_gmain_connection_slot = -1; - static dbus_int32_t server_slot = -1; - - static ConnectionSetup* -@@ -560,8 +560,8 @@ dbus_connection_setup_with_g_main (DBusC - /* FIXME we never free the slot, so its refcount just keeps growing, - * which is kind of broken. - */ -- dbus_connection_allocate_data_slot (&connection_slot); -- if (connection_slot < 0) -+ dbus_connection_allocate_data_slot (&_dbus_gmain_connection_slot); -+ if (_dbus_gmain_connection_slot < 0) - goto nomem; - - if (context == NULL) -@@ -569,7 +569,7 @@ dbus_connection_setup_with_g_main (DBusC - - cs = NULL; - -- old_setup = dbus_connection_get_data (connection, connection_slot); -+ old_setup = dbus_connection_get_data (connection, _dbus_gmain_connection_slot); - if (old_setup != NULL) - { - if (old_setup->context == context) -@@ -578,14 +578,14 @@ dbus_connection_setup_with_g_main (DBusC - cs = connection_setup_new_from_old (context, old_setup); - - /* Nuke the old setup */ -- dbus_connection_set_data (connection, connection_slot, NULL, NULL); -+ dbus_connection_set_data (connection, _dbus_gmain_connection_slot, NULL, NULL); - old_setup = NULL; - } - - if (cs == NULL) - cs = connection_setup_new (context, connection); - -- if (!dbus_connection_set_data (connection, connection_slot, cs, -+ if (!dbus_connection_set_data (connection, _dbus_gmain_connection_slot, cs, - (DBusFreeFunction)connection_setup_free)) - goto nomem; - Deleted: projects/haf/trunk/dbus-glib/debian/patches/09-support-peer-to-peer-proxies.patch =================================================================== --- projects/haf/trunk/dbus-glib/debian/patches/09-support-peer-to-peer-proxies.patch 2007-07-23 11:32:10 UTC (rev 12779) +++ projects/haf/trunk/dbus-glib/debian/patches/09-support-peer-to-peer-proxies.patch 2007-07-23 11:49:59 UTC (rev 12780) @@ -1,76 +0,0 @@ ---- a/dbus/dbus-gproxy.c -+++ b/dbus/dbus-gproxy.c -@@ -930,23 +930,23 @@ dbus_g_proxy_manager_register (DBusGProx - list->name, list); - } - -- if (list->proxies == NULL) -+ if (list->proxies == NULL && priv->name) - { - /* We have to add the match rule to the server, -- * but FIXME only if the server is a message bus, -+ * but only if the server is a message bus, - * not if it's a peer. - */ -- char *rule; -- -- rule = g_proxy_get_match_rule (proxy); -- -- /* We don't check for errors; it's not like anyone would handle them, -- * and we don't want a round trip here. -- */ -- dbus_bus_add_match (manager->connection, -- rule, NULL); -- -- g_free (rule); -+ char *rule; -+ -+ rule = g_proxy_get_match_rule (proxy); -+ -+ /* We don't check for errors; it's not like anyone would handle them, and -+ * we don't want a round trip here. -+ */ -+ dbus_bus_add_match (manager->connection, -+ rule, NULL); -+ -+ g_free (rule); - } - - g_assert (g_slist_find (list->proxies, proxy) == NULL); -@@ -1198,7 +1198,6 @@ dbus_g_proxy_manager_filter (DBusConnect - sender = dbus_message_get_sender (message); - - /* dbus spec requires these, libdbus validates */ -- g_assert (sender != NULL); - g_assert (dbus_message_get_path (message) != NULL); - g_assert (dbus_message_get_interface (message) != NULL); - g_assert (dbus_message_get_member (message) != NULL); -@@ -1219,7 +1218,7 @@ dbus_g_proxy_manager_filter (DBusConnect - - g_free (tri); - -- if (manager->owner_names) -+ if (manager->owner_names && sender) - { - owned_names = g_hash_table_lookup (manager->owner_names, sender); - for (tmp = owned_names; tmp; tmp = tmp->next) -@@ -1342,7 +1341,6 @@ dbus_g_proxy_constructor (GType - * on these parameters being provided. unfortunately we can't assert - * for manager because it's allowed to be NULL when tha mangager is - * setting up a bus proxy for its own calls */ -- g_assert (priv->name != NULL); - g_assert (priv->path != NULL); - g_assert (priv->interface != NULL); - -@@ -1498,7 +1496,10 @@ dbus_g_proxy_set_property (GObject *obje - { - case PROP_NAME: - priv->name = g_strdup (g_value_get_string (value)); -- priv->for_owner = (priv->name[0] == ':'); -+ if (priv->name) -+ priv->for_owner = (priv->name[0] == ':'); -+ else -+ priv->for_owner = TRUE; - break; - case PROP_PATH: - priv->path = g_strdup (g_value_get_string (value)); Modified: projects/haf/trunk/dbus-glib/debian/rules =================================================================== --- projects/haf/trunk/dbus-glib/debian/rules 2007-07-23 11:32:10 UTC (rev 12779) +++ projects/haf/trunk/dbus-glib/debian/rules 2007-07-23 11:49:59 UTC (rev 12780) @@ -9,7 +9,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_TAR_SRCDIR := dbus-glib-0.73 +DEB_TAR_SRCDIR := dbus-glib-0.74 include /usr/share/cdbs/1/rules/tarball.mk # Use soft-float and thumb mode if it is enabled.
- Previous message: [maemo-commits] r12779 - in projects/haf/trunk/hildon-theme-layout-4: . rc
- Next message: [maemo-commits] r12781 - projects/haf/trunk/hail
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]