From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 24 May 2010 07:34:00 +0000 (+0200)
Subject: Add html target to output viewer clipboard
X-Git-Tag: v0.7.6~411
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0c5a88743b6e6964133405548a0833f410b6979;p=pspp-builds.git

Add html target to output viewer clipboard
---

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 3107547b..f2580b7b 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -624,6 +624,10 @@ clipboard_get_cb (GtkClipboard     *clipboard,
       string_map_insert (&options, "format", "txt");
       break;
 
+    case SELECT_FMT_HTML:
+      string_map_insert (&options, "format", "html");
+      break;
+
     default:
       goto finish;
       break;
@@ -647,7 +651,8 @@ clipboard_get_cb (GtkClipboard     *clipboard,
       n = n->next;
     }
 
-  driver->class->flush (driver);
+  if ( driver->class->flush)
+    driver->class->flush (driver);
 
   if ( g_file_get_contents (filename, &text, &length, NULL) )
     {
@@ -683,9 +688,7 @@ static const GtkTargetEntry targets[] = {
   { "UTF8_STRING",   0, SELECT_FMT_UTF8 },
   { "text/plain;charset=utf-8", 0, SELECT_FMT_UTF8 },
 
-  /*
   { "text/html",     0, SELECT_FMT_HTML }
-  */
 };
 
 static void