Trunk merge

(bzr r11073.1.15)

1 files changed, 10 insertions, 2 deletions

diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index ab7b99237..c81385dd7 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -164,10 +164,10 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
         _na[i].show_all();
         __na[i] = (_("Nothing selected"));
 
-        _none[i].set_markup (_("<i>None</i>"));
+        _none[i].set_markup (C_("Fill and stroke", "<i>None</i>"));
         sp_set_font_size_smaller (GTK_WIDGET(_none[i].gobj()));
         _none[i].show_all();
-        __none[i] = (i == SS_FILL)? (_("No fill")) : (_("No stroke"));
+        __none[i] = (i == SS_FILL)? (C_("Fill and stroke", "No fill")) : (C_("Fill and stroke", "No stroke"));
 
         _pattern[i].set_markup (_("Pattern"));
         sp_set_font_size_smaller (GTK_WIDGET(_pattern[i].gobj()));
@@ -1259,7 +1259,11 @@ RotateableSwatch::do_motion(double by, guint modifier) {
             g_object_unref (bitmap);
             g_object_unref (mask);
             gdk_window_set_cursor(gtk_widget_get_window(w), cr);
+#if GTK_CHECK_VERSION(3,0,0)
+	    g_object_unref(cr);
+#else
             gdk_cursor_unref(cr);
+#endif
             cr_set = true;
         }
     }
@@ -1314,7 +1318,11 @@ RotateableSwatch::do_release(double by, guint modifier) {
         GtkWidget *w = GTK_WIDGET(gobj());
         gdk_window_set_cursor(gtk_widget_get_window(w), NULL);
         if (cr) {
+#if GTK_CHECK_VERSION(3,0,0)
+           g_object_unref(cr);
+#else
            gdk_cursor_unref (cr);
+#endif
            cr = NULL;
         }
         cr_set = false;