diff --git a/ChangeLog b/ChangeLog
index 7954e9559a..9d02722f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-10  Marek Kasik  <mkasik@redhat.com>
+
+	Bug 560135 - Print when the user double clicks a printer
+
+	* gtk/gtkprintunixdialog.c: add handling of double click to
+	GtkPrintUnixDialog.
+
 2008-11-07  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtkpaned.c: argh, actually call the newly added private
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 9ac5b19f33..5a7b406a38 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -1697,6 +1697,19 @@ update_range_sensitivity (GtkWidget *button,
   gtk_widget_set_sensitive (range, active);
 }
 
+void
+emit_ok_response (GtkTreeView       *tree_view,
+                  GtkTreePath       *path,
+                  GtkTreeViewColumn *column,
+                  gpointer          *user_data)
+{
+  GtkPrintUnixDialog *print_dialog;
+
+  print_dialog = (GtkPrintUnixDialog *) user_data;
+
+  gtk_dialog_response (GTK_DIALOG (print_dialog), GTK_RESPONSE_OK);
+}
+
 static void
 create_main_page (GtkPrintUnixDialog *dialog)
 {
@@ -1775,6 +1788,8 @@ create_main_page (GtkPrintUnixDialog *dialog)
 						     NULL);
   gtk_tree_view_column_set_cell_data_func (column, renderer, set_cell_sensitivity_func, NULL, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+
+  g_signal_connect (GTK_TREE_VIEW (treeview), "row-activated", G_CALLBACK (emit_ok_response), dialog);
   
   gtk_widget_show (treeview);
   gtk_container_add (GTK_CONTAINER (scrolled), treeview);