--- trunk/src/html.c 2009/06/20 11:44:14 2
+++ trunk/src/html.c 2009/06/29 08:24:41 17
@@ -178,30 +178,27 @@
fclose(f);
} else {
- if(context->appdata->load_images) {
- printf("image file doesn't exist, starting extra thread!\n");
+ printf("image file doesn't exist, starting extra thread!\n");
- checkdir(path);
-
- /* walk to end of list */
- load_context_t **load_context = &(context->load_context);
- while(*load_context)
- load_context = &(*load_context)->next;
-
- *load_context = g_new0(load_context_t, 1);
-
- (*load_context)->url = strdup(url);
- (*load_context)->path = strdup(path);
- (*load_context)->view = context->view;
- (*load_context)->stream = stream;
- (*load_context)->next = NULL;
- (*load_context)->active = TRUE;
- (*load_context)->mutex = g_mutex_new();
-
- g_thread_create(loader_thread, *load_context, TRUE, NULL);
- return;
- } else
- g_print("Image loading disabled\n");
+ checkdir(path);
+
+ /* walk to end of list */
+ load_context_t **load_context = &(context->load_context);
+ while(*load_context)
+ load_context = &(*load_context)->next;
+
+ *load_context = g_new0(load_context_t, 1);
+
+ (*load_context)->url = strdup(url);
+ (*load_context)->path = strdup(path);
+ (*load_context)->view = context->view;
+ (*load_context)->stream = stream;
+ (*load_context)->next = NULL;
+ (*load_context)->active = TRUE;
+ (*load_context)->mutex = g_mutex_new();
+
+ g_thread_create(loader_thread, *load_context, TRUE, NULL);
+ return;
}
} else {
/* not a cache, maybe help, so load images from icon directory */
@@ -350,9 +347,6 @@
}
#endif
-/* panning a gtkhtml view currently doesn't work well */
-#undef PANNABLE_HTML
-
#ifdef PANNABLE_HTML
/* eat the button events */
static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event,
@@ -419,7 +413,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();