--- trunk/src/html.c	2009/06/20 11:08:47	1
+++ trunk/src/html.c	2009/06/26 12:24:24	11
@@ -247,6 +247,7 @@
   }
 }
 
+#ifndef NO_COPY_N_PASTE
 static void on_destroy_textview(GtkWidget *widget, gpointer data) {
   appdata_t *appdata = (appdata_t*)data;
   int destroy_active = FALSE;
@@ -284,6 +285,7 @@
     gtk_widget_set_sensitive(appdata->menu_paste, FALSE);
   }
 }
+#endif
 
 static void on_destroy_htmlview(GtkWidget *widget, gpointer data) {
   http_context_t *context = (http_context_t*)data;
@@ -312,12 +314,15 @@
     load_context = tmp_context;
   }
 
+#ifndef NO_COPY_N_PASTE
   on_destroy_textview(widget, context->appdata);
+#endif
 
   /* destroy context */
   free(data);
 }
 
+#ifndef NO_COPY_N_PASTE
 static gboolean focus_in(GtkWidget *widget, GdkEventFocus *event,
 			 gpointer data) {
   appdata_t *appdata = (appdata_t*)data;
@@ -343,9 +348,10 @@
 void html_copy_to_clipboard(appdata_t *appdata) {
   gtk_html_copy(GTK_HTML(appdata->active_buffer));
 }
+#endif
 
 /* panning a gtkhtml view currently doesn't work well */
-#undef PANNABLE_HTML
+#define PANNABLE_HTML
 
 #ifdef PANNABLE_HTML
 /* eat the button events */
@@ -413,7 +419,7 @@
     GtkTextBuffer *buffer = gtk_text_buffer_new(NULL);
     gtk_text_buffer_set_text(buffer, text, strlen(text));
 
-#ifndef USE_MAEMO    
+#ifndef USE_HILDON_TEXT_VIEW
     view = gtk_text_view_new_with_buffer(buffer);
 #else
     view = hildon_text_view_new();
@@ -424,12 +430,16 @@
     gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
     gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(view), FALSE);
 
+#ifndef NO_COPY_N_PASTE
     g_signal_connect(G_OBJECT(view), "destroy", 
 		     G_CALLBACK(on_destroy_textview), appdata);
+#endif
   } 
   
+#ifndef NO_COPY_N_PASTE
   g_signal_connect(G_OBJECT(view), "focus-in-event", 
 		   G_CALLBACK(focus_in), appdata);
+#endif
 
   if(scrollwin) {
 #ifndef USE_PANNABLE_AREA