aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-03-14 18:08:12 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-14 21:05:35 +0800
commitd307a9d0608735925aaa7bd758ee5c5df62f2a0e (patch)
treeddbc457dc0088200c1dc1f147e75b89606cf5c13
parent706b0ad396bd569224e28ed45090a3457e0634f8 (diff)
downloadgsoc2013-empathy-d307a9d0608735925aaa7bd758ee5c5df62f2a0e.tar
gsoc2013-empathy-d307a9d0608735925aaa7bd758ee5c5df62f2a0e.tar.gz
gsoc2013-empathy-d307a9d0608735925aaa7bd758ee5c5df62f2a0e.tar.bz2
gsoc2013-empathy-d307a9d0608735925aaa7bd758ee5c5df62f2a0e.tar.lz
gsoc2013-empathy-d307a9d0608735925aaa7bd758ee5c5df62f2a0e.tar.xz
gsoc2013-empathy-d307a9d0608735925aaa7bd758ee5c5df62f2a0e.tar.zst
gsoc2013-empathy-d307a9d0608735925aaa7bd758ee5c5df62f2a0e.zip
Reenable labels in MxGtkLightSwitch
-rw-r--r--libempathy-gtk/mx-gtk-light-switch.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/libempathy-gtk/mx-gtk-light-switch.c b/libempathy-gtk/mx-gtk-light-switch.c
index a1427a318..6337b41b6 100644
--- a/libempathy-gtk/mx-gtk-light-switch.c
+++ b/libempathy-gtk/mx-gtk-light-switch.c
@@ -90,10 +90,8 @@ struct _MxGtkLightSwitchPrivate {
gint offset; /* offset of the mouse to slider when dragging */
};
-/* MEDIUM VERTICAL BAR U+2759 */
-#define ON_STRING "\342\235\231"
- /* WHITE CIRCLE U+25CB */
-#define OFF_STRING "\342\227\213"
+#define ON_STRING _("On")
+#define OFF_STRING _("Off")
#define UNAVAILABLE_STRING _("Unavailable")
@@ -204,13 +202,11 @@ draw (GtkWidget *lightswitch,
gint on_label_x;
gint off_label_x;
-/*
gint label_width;
gint label_height;
-*/
GtkStyle *style;
-// PangoLayout *layout;
-// PangoContext *context;
+ PangoLayout *layout;
+ PangoContext *context;
GtkStateType state_type;
priv = MX_GTK_LIGHT_SWITCH_GET_PRIVATE (lightswitch);
@@ -238,9 +234,10 @@ draw (GtkWidget *lightswitch,
(priv->trough_width),
priv->switch_height);
+#if 0
if (state_type == GTK_STATE_INSENSITIVE)
return;
-#if 0
+#else
if (state_type == GTK_STATE_INSENSITIVE)
{
context = gdk_pango_context_get ();