[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / gio / tests / gdbus-tests.h

diff --git a/gio/tests/gdbus-tests.h b/gio/tests/gdbus-tests.h
index ffcc57c..538b265 100644 (file)
--- a/gio/tests/gdbus-tests.h
+++ b/gio/tests/gdbus-tests.h
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: David Zeuthen <davidz@redhat.com>
  */
@@ -90,7 +88,7 @@ G_BEGIN_DECLS
                                __FILE__,                                \
                                __LINE__,                                \
                                G_STRFUNC,                               \
-                               "Signal `" signal_name "' does not "     \
+                               "Signal '" signal_name "' does not "     \
                                "exist on object");                      \
         }                                                               \
       if (_g_assert_signal_received_run (object, signal_name))          \
@@ -99,7 +97,7 @@ G_BEGIN_DECLS
                                __FILE__,                                \
                                __LINE__,                                \
                                G_STRFUNC,                               \
-                               "Timed out waiting for signal `"         \
+                               "Timed out waiting for signal '"         \
                                signal_name "'");                        \
         }                                                               \
     }                                                                   \
@@ -116,31 +114,6 @@ GDBusConnection *_g_bus_get_priv (GBusType            bus_type,
                                   GCancellable       *cancellable,
                                   GError            **error);
 
-
-#define _g_object_wait_for_single_ref(object) \
-  do \
-    { \
-      if (!G_IS_OBJECT (object))                                        \
-        {                                                               \
-          g_assertion_message (G_LOG_DOMAIN,                            \
-                               __FILE__,                                \
-                               __LINE__,                                \
-                               G_STRFUNC,                               \
-                               "Not a GObject instance");               \
-        }                                                               \
-      if (_g_object_wait_for_single_ref_do (object))                    \
-        {                                                               \
-          g_assertion_message (G_LOG_DOMAIN,                            \
-                               __FILE__,                                \
-                               __LINE__,                                \
-                               G_STRFUNC,                               \
-                               "Timed out waiting for single ref");     \
-        }                                                               \
-    }                                                                   \
-  while (FALSE)
-
-gboolean _g_object_wait_for_single_ref_do (gpointer object);
-
 G_END_DECLS
 
 #endif /* __TESTS_H__ */