--- ristreto.orig/src/main_window.c	2009-04-27 16:24:15.000000000 +0200
+++ ristreto/src/main_window.c	2009-04-27 16:01:38.000000000 +0200
@@ -181,6 +181,9 @@
         GtkToolItem *tool_item_separator_1;
         GtkToolItem *tool_item_next;
         GtkToolItem *tool_item_previous;
+        GtkToolItem *tool_item_separator_2;
+        GtkToolItem *tool_item_rotate_left;
+        GtkToolItem *tool_item_rotate_right;
         GtkToolItem *tool_item_spacer_1;
 
         GtkToolItem *tool_item_zoom_fit;
@@ -581,6 +584,9 @@
     window->priv->toolbar.tool_item_separator_1 = gtk_separator_tool_item_new();
     window->priv->toolbar.tool_item_next = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD);
     window->priv->toolbar.tool_item_previous = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK);
+    window->priv->toolbar.tool_item_separator_2 = gtk_separator_tool_item_new();
+    window->priv->toolbar.tool_item_rotate_left = gtk_tool_button_new_from_stock(GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE);
+    window->priv->toolbar.tool_item_rotate_right = gtk_tool_button_new_from_stock(GTK_STOCK_ORIENTATION_LANDSCAPE);
     window->priv->toolbar.tool_item_spacer_1= gtk_tool_item_new();
 
     gtk_tool_item_set_is_important(window->priv->toolbar.tool_item_previous, TRUE);
@@ -598,14 +604,19 @@
     gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_separator_1, 1);
     gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_previous, 2);
     gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_next, 3);
-    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_spacer_1, 4);
-    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_in, 5);
-    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_out, 6);
-    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_fit, 7);
-    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_100, 8);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_separator_2, 4);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_rotate_left, 5);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_rotate_right, 6);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_spacer_1, 7);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_in, 8);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_out, 9);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_fit, 10);
+    gtk_toolbar_insert(GTK_TOOLBAR(window->priv->toolbar.bar), window->priv->toolbar.tool_item_zoom_100, 11);
 
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_previous), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_next), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_rotate_left), FALSE);
+    gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_rotate_right), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_in), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_out), FALSE);
     gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_100), FALSE);
@@ -827,6 +838,14 @@
             "clicked",
             G_CALLBACK(cb_rstto_main_window_previous), window);
 
+    g_signal_connect(window->priv->toolbar.tool_item_rotate_left,
+            "clicked",
+            G_CALLBACK(cb_rstto_main_window_rotate_ccw), window);
+
+    g_signal_connect(window->priv->toolbar.tool_item_rotate_right,
+            "clicked",
+            G_CALLBACK(cb_rstto_main_window_rotate_cw), window);
+
     g_signal_connect(window->priv->toolbar.tool_item_zoom_in,
             "clicked",
             G_CALLBACK(cb_rstto_main_window_zoom_in), window);
@@ -1848,6 +1867,9 @@
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_next), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_previous), TRUE);
 
+        gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_rotate_left), TRUE);
+        gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_rotate_right), TRUE);
+
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_in), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_out), TRUE);
         gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_fit), TRUE);
@@ -1958,6 +1980,8 @@
 
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_next), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_previous), FALSE);
+            gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_rotate_left), FALSE);
+            gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_rotate_right), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_in), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_out), FALSE);
             gtk_widget_set_sensitive(GTK_WIDGET(window->priv->toolbar.tool_item_zoom_fit), FALSE);