Port Moblin widgets to Mx

diff --git a/configure.ac b/configure.ac
index 33340df12aa96dc146639b31f36462b2e1d892c1..c71bb9b7d309a7c8968535f93b3fa37bbf58c44e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -412,7 +412,7 @@ AC_ARG_ENABLE(moblin,
 if test "x$enable_moblin" != "xno"; then
     PKG_CHECK_MODULES(MOBLIN,
     [
-       nbtk-gtk-1.2
+       mx-gtk-1.0
     ], have_moblin="yes", have_moblin="no")
 
     if test "x$have_moblin" = "xyes"; then

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index b17dca72f1440d079a5965d9bb4d3c1a20e3974d..cbc2a1cbc3c8c812dd4b7ff10c9c6218009bbc1c 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n-lib.h>
 
 #ifdef HAVE_MOBLIN
-#include <nbtk/nbtk-gtk.h>
+#include <mx/mx-gtk.h>
 #endif
 
 #include <libempathy/empathy-utils.h>
@@ -746,8 +746,8 @@ account_widget_applied_cb (GObject *source_object,
 
           enabled_checked =
 #ifdef HAVE_MOBLIN
-            nbtk_gtk_light_switch_get_active (
-                NBTK_GTK_LIGHT_SWITCH (priv->enabled_checkbox));
+            mx_gtk_light_switch_get_active (
+                MX_GTK_LIGHT_SWITCH (priv->enabled_checkbox));
 #else
             gtk_toggle_button_get_active (
                 GTK_TOGGLE_BUTTON (priv->enabled_checkbox));
@@ -1331,8 +1331,8 @@ empathy_account_widget_enabled_cb (TpAccount *account,
   if (priv->enabled_checkbox != NULL)
     {
 #ifdef HAVE_MOBLIN
-      nbtk_gtk_light_switch_set_active (
-          NBTK_GTK_LIGHT_SWITCH (priv->enabled_checkbox),
+      mx_gtk_light_switch_set_active (
+          MX_GTK_LIGHT_SWITCH (priv->enabled_checkbox),
           enabled);
 #else
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->enabled_checkbox),
@@ -1343,7 +1343,7 @@ empathy_account_widget_enabled_cb (TpAccount *account,
 
 static void
 #ifdef HAVE_MOBLIN
-account_widget_switch_flipped_cb (NbtkGtkLightSwitch *sw,
+account_widget_switch_flipped_cb (MxGtkLightSwitch *sw,
     gboolean state,
     gpointer user_data)
 #else
@@ -1512,10 +1512,10 @@ add_enable_checkbox (EmpathyAccountWidget *self,
   w = gtk_label_new (_("Account:"));
   gtk_misc_set_alignment (GTK_MISC (w), 0, 0.5);
 
-  priv->enabled_checkbox = nbtk_gtk_light_switch_new ();
+  priv->enabled_checkbox = mx_gtk_light_switch_new ();
 
-  nbtk_gtk_light_switch_set_active (
-      NBTK_GTK_LIGHT_SWITCH (priv->enabled_checkbox), is_enabled);
+  mx_gtk_light_switch_set_active (
+      MX_GTK_LIGHT_SWITCH (priv->enabled_checkbox), is_enabled);
 
   gtk_widget_show (w);
 #else