aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2010-02-12 09:15:47 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2010-02-12 19:17:16 +0800
commitbc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4 (patch)
treea6de2e2a115707a87c8b0a1fef9db0b9f7f6008c
parent8d2e9d517beed4f272bed7ae9a2f59b96688e6c6 (diff)
downloadgsoc2013-empathy-bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4.tar
gsoc2013-empathy-bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4.tar.gz
gsoc2013-empathy-bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4.tar.bz2
gsoc2013-empathy-bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4.tar.lz
gsoc2013-empathy-bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4.tar.xz
gsoc2013-empathy-bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4.tar.zst
gsoc2013-empathy-bc744cd293dc2b9b0884fd0d1af9cbc91dcfb7b4.zip
Port Moblin widgets to Mx
-rw-r--r--configure.ac2
-rw-r--r--libempathy-gtk/empathy-account-widget.c18
2 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 33340df12..c71bb9b7d 100644
--- 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 b17dca72f..cbc2a1cbc 100644
--- 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