File dbus-glib-0.86-cummulated.patch of Package mingw64-dbus-1-glib

Overview Repositories Revisions Requests Users Attributes Meta

File dbus-glib-0.86-cummulated.patch of Package mingw64-dbus-1-glib (Revision 9c946e31634dede8b15be84800023e58)

Currently displaying revision 9c946e31634dede8b15be84800023e58 , Show latest

--- configure.ac
+++ configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 
 AC_INIT(dbus-glib, 0.86, [https://bugs.freedesktop.org/enter_bug.cgi?product=dbus])
 
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE([1.9])
 
--- dbus/dbus-gidl.h
+++ dbus/dbus-gidl.h
@@ -80,7 +80,7 @@ const char*         node_info_get_name            (NodeInfo            *info);
 GSList*             node_info_get_interfaces      (NodeInfo            *info);
 GSList*             node_info_get_nodes           (NodeInfo            *info);
 void                node_info_add_interface       (NodeInfo            *info,
-                                                   InterfaceInfo       *interface);
+                                                   InterfaceInfo       *iface);
 void                node_info_add_node            (NodeInfo            *info,
                                                    NodeInfo            *child);
 void                node_info_replace_node        (NodeInfo            *info,
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h
index 256f817..1b236d8 100644
--- dbus/dbus-glib.h
+++ dbus/dbus-glib.h
@@ -233,14 +233,14 @@ GType             dbus_g_proxy_get_type              (void) G_GNUC_CONST;
 DBusGProxy*       dbus_g_proxy_new_for_name          (DBusGConnection   *connection,
                                                       const char        *name,
                                                       const char        *path,
-                                                      const char        *interface);
+                                                      const char        *iface);
 DBusGProxy*       dbus_g_proxy_new_for_name_owner    (DBusGConnection   *connection,
                                                       const char        *name,
                                                       const char        *path,
-                                                      const char        *interface,
+                                                      const char        *iface,
                                                       GError           **error);
 DBusGProxy*       dbus_g_proxy_new_from_proxy        (DBusGProxy        *proxy,
-                                                      const char        *interface,
+                                                      const char        *iface,
                                                       const char        *path_name);
 DBusGProxy*       dbus_g_proxy_new_for_peer          (DBusGConnection   *connection,
                                                       const char        *path_name,
--- dbus/dbus-gobject.c
+++ dbus/dbus-gobject.c
@@ -1218,16 +1218,21 @@ gerror_domaincode_to_dbus_error_name (const DBusGObjectInfo *object_info,
 
   if (!domain_str || !code_str)
     {
+      const char *domain_string;
       /* If we can't map it sensibly, make up an error name */
-      char *domain_from_quark;
       
       dbus_error_name = g_string_new ("org.freedesktop.DBus.GLib.UnmappedError.");
 
-      domain_from_quark = uscore_to_wincaps (g_quark_to_string (domain));
-      g_string_append (dbus_error_name, domain_from_quark);
-      g_free (domain_from_quark);
-	
-      g_string_append_printf (dbus_error_name, ".Code%d", code);
+      domain_string = g_quark_to_string (domain);
+      if (domain_string != NULL)
+        {
+          char *uscored = uscore_to_wincaps (domain_string);
+          g_string_append (dbus_error_name, uscored);
+          g_string_append_c (dbus_error_name, '.');
+          g_free (uscored);
+        }
+
+      g_string_append_printf (dbus_error_name, "Code%d", code);
     }
   else
     {
@@ -2324,7 +2349,7 @@ dbus_g_connection_register_g_object (DBusGConnection       *connection,
       o = iter->data;
 
       /* Silently ignore duplicate registrations */
-      if (strcmp (o->object_path, at_path) == 0)
+      if (strcmp (o->object_path, at_path) == 0 && o->connection == connection)
         return;
     }
 
--- dbus/dbus-gproxy.c
+++ dbus/dbus-gproxy.c
@@ -2740,11 +2740,10 @@ dbus_g_proxy_cancel_call (DBusGProxy        *proxy,
   call_id = DBUS_G_PROXY_CALL_TO_ID (call);
 
   pending = g_hash_table_lookup (priv->pending_calls, GUINT_TO_POINTER (call_id));
+  g_hash_table_remove (priv->pending_calls, GUINT_TO_POINTER (call_id));
   g_return_if_fail (pending != NULL);
 
   dbus_pending_call_cancel (pending);
-
-  g_hash_table_remove (priv->pending_calls, GUINT_TO_POINTER (call_id));
 }
 
 /**
--- doc/reference/dbus-glib-sections.txt
+++ doc/reference/dbus-glib-sections.txt
@@ -164,6 +164,15 @@ dbus_g_type_register_map
 dbus_g_type_map_peek_vtable
 dbus_g_type_collection_peek_vtable
 dbus_g_type_register_struct
+DBUS_TYPE_G_BOOLEAN_ARRAY
+DBUS_TYPE_G_UCHAR_ARRAY
+DBUS_TYPE_G_UINT_ARRAY
+DBUS_TYPE_G_INT_ARRAY
+DBUS_TYPE_G_UINT64_ARRAY
+DBUS_TYPE_G_INT64_ARRAY
+DBUS_TYPE_G_OBJECT_ARRAY
+DBUS_TYPE_G_STRING_STRING_HASHTABLE
+DBUS_TYPE_G_SIGNATURE
 </SECTION>
 
 <SUBSECTION Private>
--- test/core/Makefile.am
+++ test/core/Makefile.am
@@ -76,7 +76,7 @@ test_dbus_glib_SOURCES=				\
 	my-object-marshal.c                             \
 	test-dbus-glib.c
 
-test_dbus_glib_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/dbus/libdbus-glib-1.la $(top_builddir)/dbus/libdbus-gtool.la
+test_dbus_glib_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/dbus/libdbus-gtool.la $(top_builddir)/dbus/libdbus-glib-1.la $(DBUS_GLIB_LIBS)
 
 test_variant_recursion_SOURCES=test-variant-recursion.c
 
@@ -93,13 +93,13 @@ test_service_glib_SOURCES=				\
 	test-service-glib.c 
 test_service_glib_LDADD= $(top_builddir)/dbus/libdbus-glib-1.la $(DBUS_GLIB_THREADS_LIBS) 
 
-test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
+test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml
 
-test-service-glib-subclass-glue.h: test-service-glib-subclass.xml $(top_builddir)/dbus/dbus-binding-tool
+test-service-glib-subclass-glue.h: test-service-glib-subclass.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object_subclass --mode=glib-server --output=test-service-glib-subclass-glue.h $(srcdir)/test-service-glib-subclass.xml
 
-test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool
+test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DEBUG) $(DBUS_BINDING_TOOL) --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml
 
 my-object-marshal.c: Makefile my-object-marshal.list
diff --git a/test/core/my-object.c b/test/core/my-object.c
index 886943e..0fa8277 100644
--- test/core/my-object.c
+++ test/core/my-object.c
@@ -246,6 +246,18 @@ my_object_throw_error_multi_word (MyObject *obj, GError **error)
   return FALSE;
 }
 
+gboolean
+my_object_throw_unregistered_error (MyObject *obj, GError **error)
+{
+  /* Unregistered errors shouldn't cause a dbus abort.  See
+   * https://bugzilla.redhat.com/show_bug.cgi?id=581794
+   */
+  g_set_error (error, 0, 0,
+	       "%s",
+	       "this method always loses more");
+  return FALSE;
+}
+
 
 gboolean
 my_object_uppercase (MyObject *obj, const char *str, char **ret, GError **error)
--- test/core/my-object.h
+++ test/core/my-object.h
@@ -52,6 +52,7 @@ gint32   my_object_increment_retval_error (MyObject *obj, gint32 x, GError **err
 gboolean my_object_throw_error (MyObject *obj, GError **error);
 gboolean my_object_throw_not_supported (MyObject *obj, GError **error);
 gboolean my_object_throw_error_multi_word (MyObject *obj, GError **error);
+gboolean my_object_throw_unregistered_error (MyObject *obj, GError **error);
 
 gboolean my_object_uppercase (MyObject *obj, const char *str, char **ret, GError **error);
 
--- test/core/test-dbus-glib.c
+++ test/core/test-dbus-glib.c
@@ -796,6 +796,14 @@ main (int argc, char **argv)
   g_print ("ThrowNotSupported correctly returned error: %s\n", error->message);
   g_clear_error (&error);
 
+  g_print ("Calling ThrowUnregisteredError\n");
+  if (dbus_g_proxy_call (proxy, "ThrowUnregisteredError", &error,
+			 G_TYPE_INVALID, G_TYPE_INVALID) != FALSE)
+    lose ("ThrowError call unexpectedly succeeded!");
+
+  g_print ("ThrowUnregisteredError failed (as expected) returned error: %s\n", error->message);
+  g_clear_error (&error);
+
   g_print ("Calling IncrementRetvalError (for error)\n");
   error = NULL;
   v_UINT32_2 = 0;
--- test/core/test-profile.c
+++ test/core/test-profile.c
@@ -23,6 +23,14 @@
 
 #include <config.h>
 #include <glib.h>
+
+/* This test uses Unix-specific facilities */
+#ifdef G_OS_WIN32
+#define TEST_PROFILE_DISABLED
+#endif
+
+#ifndef TEST_PROFILE_DISABLED
+
 #include <dbus/dbus-glib-lowlevel.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -1090,13 +1098,15 @@ print_result (const ProfileRunVTable *vtable,
               seconds/baseline, vtable->name,
               seconds, seconds / N_ITERATIONS);
 }
+#endif
 
 int
 main (int argc, char *argv[])
 {
+#ifndef TEST_PROFILE_DISABLED
   g_thread_init (NULL);
   dbus_g_thread_init ();
-  
+
 #ifndef DBUS_DISABLE_ASSERT
   g_printerr ("You should probably --disable-asserts before you profile as they have noticeable overhead\n");
 #endif
@@ -1145,6 +1155,6 @@ main (int argc, char *argv[])
 
   /* Make valgrind happy */
   dbus_shutdown ();
-  
+#endif  /* TEST_PROFILE_DISABLED */
   return 0;
 }
--- test/core/test-service-glib.xml
+++ test/core/test-service-glib.xml
@@ -35,6 +35,9 @@
     <method name="ThrowErrorMultiWord">
     </method>
 
+    <method name="ThrowUnregisteredError">
+    </method>
+
     <method name="Uppercase">
       <arg type="s" direction="in" />
       <arg type="s" direction="out" />
--- test/interfaces/Makefile.am
+++ test/interfaces/Makefile.am
@@ -38,7 +38,7 @@ test_service_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/dbus/libdbus-glib-1.l
 test_client_SOURCES = \
 	test-client.c
 
-test_client_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/dbus/libdbus-glib-1.la $(top_builddir)/dbus/libdbus-gtool.la
+test_client_LDADD= $(DBUS_GLIB_TOOL_LIBS) $(top_builddir)/dbus/libdbus-gtool.la $(top_builddir)/dbus/libdbus-glib-1.la $(DBUS_GLIB_LIBS)
 
 BUILT_SOURCES = \
 	test-song-glue.h		\
@@ -54,34 +54,34 @@ BUILT_SOURCES = \
 	test-dup-prop-b-bindings.h \
 	test-dup-prop-b-bindings.h
 
-test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
+test-song-glue.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-server --output=test-song-glue.h $(srcdir)/test-song.xml
 
-test-song-bindings.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool
+test-song-bindings.h: test-song.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_song --mode=glib-client --output=test-song-bindings.h $(srcdir)/test-song.xml
 
-test-hello-glue.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
+test-hello-glue.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-server --output=test-hello-glue.h $(srcdir)/test-hello.xml
 
-test-hello-bindings.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool
+test-hello-bindings.h: test-hello.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_hello --mode=glib-client --output=test-hello-bindings.h $(srcdir)/test-hello.xml
 
-test-goodbye-glue.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
+test-goodbye-glue.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-server --output=test-goodbye-glue.h $(srcdir)/test-goodbye.xml
 
-test-goodbye-bindings.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool
+test-goodbye-bindings.h: test-goodbye.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_goodbye --mode=glib-client --output=test-goodbye-bindings.h $(srcdir)/test-goodbye.xml
 
-test-dup-prop-a-glue.h: test-dup-prop-a.xml $(top_builddir)/dbus/dbus-binding-tool
+test-dup-prop-a-glue.h: test-dup-prop-a.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_dup_prop_a --mode=glib-server --output=test-dup-prop-a-glue.h $(srcdir)/test-dup-prop-a.xml
 
-test-dup-prop-a-bindings.h: test-dup-prop-a.xml $(top_builddir)/dbus/dbus-binding-tool
+test-dup-prop-a-bindings.h: test-dup-prop-a.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_dup_prop_a --mode=glib-client --output=test-dup-prop-a-bindings.h $(srcdir)/test-dup-prop-a.xml
 
-test-dup-prop-b-glue.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-tool
+test-dup-prop-b-glue.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_dup_prop_b --mode=glib-server --output=test-dup-prop-b-glue.h $(srcdir)/test-dup-prop-b.xml
 
-test-dup-prop-b-bindings.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-tool
+test-dup-prop-b-bindings.h: test-dup-prop-b.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
 	$(DBUS_BINDING_TOOL) --prefix=test_dup_prop_b --mode=glib-client --output=test-dup-prop-b-bindings.h $(srcdir)/test-dup-prop-b.xml

Places

File dbus-glib-0.86-cummulated.patch of Package mingw64-dbus-1-glib (Revision 9c946e31634dede8b15be84800023e58)

Places