Merge trunk

(bzr r14950.1.20)

1 files changed, 1 insertions, 18 deletions

diff --git a/src/inkview.cpp b/src/inkview.cpp
index db4b1aeb0..c90d0b85e 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -35,7 +35,6 @@
 #include <locale.h>
 
 #include <gtkmm/main.h>
-#include <glib.h>
 
 // #include <stropts.h>
 
@@ -58,8 +57,6 @@
 
 #include "inkscape.h"
 
-#include <iostream>
-
 #ifndef HAVE_BIND_TEXTDOMAIN_CODESET
 #define bind_textdomain_codeset(p,c)
 #endif
@@ -346,13 +343,7 @@ static GtkWidget* sp_svgview_control_show(struct SPSlideShow *ss)
         gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(ss->window));
         g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, ss);
         g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL);
-
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkWidget *t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-#else
-        GtkWidget *t = gtk_hbutton_box_new();
-#endif
-
+        auto t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
         gtk_container_add(GTK_CONTAINER(ctrlwin), t);
 
 #if GTK_CHECK_VERSION(3,10,0)
@@ -431,19 +422,11 @@ static void sp_svgview_waiting_cursor(struct SPSlideShow *ss)
     GdkDisplay *display = gdk_display_get_default();
     GdkCursor  *waiting = gdk_cursor_new_for_display(display, GDK_WATCH);
     gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting);
-#if GTK_CHECK_VERSION(3,0,0)
     g_object_unref(waiting);
-#else
-    gdk_cursor_unref(waiting);
-#endif
     if (ctrlwin) {
         GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH);
         gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting);
-#if GTK_CHECK_VERSION(3,0,0)
         g_object_unref(waiting);
-#else
-        gdk_cursor_unref(waiting);
-#endif
     }
     while(gtk_events_pending()) {
        gtk_main_iteration();