[empathy/next: 74/79] import_dialog_pidgin_parse_setting: use GVariantClass instead of libdbus



commit 00fc7f2ab42de7b85ad39d364d0fb6cc3d6c3115
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Thu Mar 27 16:19:24 2014 +0000

    import_dialog_pidgin_parse_setting: use GVariantClass instead of libdbus
    
    We don't need to fix this right now, strictly speaking, but it's good
    to get rid of libdbus where we can.

 src/empathy-import-pidgin.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 11baf4f..e98897c 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -23,7 +23,6 @@
 #include "empathy-import-pidgin.h"
 
 #include <glib/gstdio.h>
-#include <dbus/dbus-protocol.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-import-utils.h"
@@ -149,14 +148,14 @@ import_dialog_pidgin_parse_setting (EmpathyImportAccountData *data,
 
       i = (gint) g_ascii_strtod (content, NULL);
 
-      if (signature_i == DBUS_TYPE_INT16 ||
-          signature_i == DBUS_TYPE_INT32)
+      if (signature_i == (int) G_VARIANT_CLASS_INT16 ||
+          signature_i == (int) G_VARIANT_CLASS_INT32)
         {
           value = tp_g_value_slice_new (G_TYPE_INT);
           g_value_set_int (value, i);
         }
-      else if (signature_i == DBUS_TYPE_UINT16 ||
-          signature_i == DBUS_TYPE_UINT32)
+      else if (signature_i == (int) G_VARIANT_CLASS_UINT16 ||
+          signature_i == (int) G_VARIANT_CLASS_UINT32)
         {
           value = tp_g_value_slice_new (G_TYPE_UINT);
           g_value_set_uint (value, (guint) i);


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