Changeset 6

Timestamp:

11/07/06 16:54:16 (2 years ago)

Author:

inz

Message:

Use vfs loading for images, use hildon file chooser.

Files:

• maemo-blog/trunk/Makefile (modified) (1 diff)
• maemo-blog/trunk/gui.c (modified) (4 diffs)

maemo-blog/trunk/Makefile

@@ -35 +35 @@
-CFLAGS += $(WARNINGS)
-
+maemo_blog_CFLAGS += $(shell if pkg-config hildon-fm --exists; then pkg-config hildon-fm --cflags; echo -DHILDON_FM; fi)
+maemo_blog_LIBS += $(shell if pkg-config hildon-fm --exists; then pkg-config hildon-fm --libs; fi)
-maemo_blog_CFLAGS += $(shell if pkg-config hildon-libs --exists; then pkg-config hildon-libs --cflags; echo -DHILDON; else pkg-config gtk+-2.0 --cflags; fi)
-maemo_blog_LDFLAGS += $(shell if pkg-config hildon-libs --exists; then pkg-config hildon-libs --libs; else pkg-config gtk+-2.0 --libs; fi)
-maemo_blog_CFLAGS += $(shell if pkg-config gtksourceview-1.0 --exists; then pkg-config gtksourceview-1.0 --cflags; echo -DGTKSOURCEVIEW; fi)
-maemo_blog_LDFLAGS += $(shell if pkg-config gtksourceview-1.0 --exists; then pkg-config gtksourceview-1.0 --libs; fi)
+maemo_blog_CFLAGS += $(shell if pkg-config libgnomevfsutil --exists; then pkg-config libgnomevfsutil --cflags; echo -DHAVE_VFS_UTIL; fi)
+maemo_blog_LDFLAGS += $(shell if pkg-config libgnomevfsutil --exists; then pkg-config libgnomevfsutil --libs; fi)
+maemo_blog_CFLAGS += $(shell if pkg-config libgnomeui-2.0 --exists; then pkg-config libgnomeui-2.0 --cflags; echo -DHAVE_VFS_UTIL; fi)
+maemo_blog_LDFLAGS += $(shell if pkg-config libgnomeui-2.0 --exists; then pkg-config libgnomeui-2.0 --libs; fi)
-
-maemo_blog_CFLAGS += `pkg-config gconf-2.0 gtk+-2.0 --cflags` \

maemo-blog/trunk/gui.c

@@ -1 +1 @@
-#include <string.h>
+#ifdef HILDON_FM
+#include <hildon-widgets/hildon-file-chooser-dialog.h>
+#endif
-#ifdef HILDON
-#include <hildon-widgets/hildon-window.h>
@@ -8 +11 @@
-#include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourcelanguagesmanager.h>
+#endif
+#ifdef HAVE_VFS_UTIL
+#include <libgnomeui/gnome-vfs-util.h>
-#endif
-#include "blog-plugin.h"
@@ -181 +187 @@
-static void _img(GObject *object, GtkTextBuffer *text)
-{
+#ifdef HILDON_FM
+        GtkWidget *dialog = hildon_file_chooser_dialog_new("Open file...",
+                        GTK_WINDOW(gtk_widget_get_toplevel(
+                                        GTK_WIDGET(object))),
+                        GTK_FILE_CHOOSER_ACTION_OPEN);
+        gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+                        "Ok", GTK_RESPONSE_OK,
+                        "Cancel", GTK_RESPONSE_CANCEL,
+                        NULL);
+#else
-        GtkWidget *dialog = gtk_file_chooser_dialog_new("Open file...",
-                        GTK_WINDOW(gtk_widget_get_toplevel(
@@ -188 +204 @@
-                        "Cancel", GTK_RESPONSE_CANCEL,
-                        NULL);
+#endif
-
-        gtk_widget_show_all(GTK_WIDGET(dialog));
-        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
+#ifdef HAVE_VFS_UTIL
+                gchar *file = gtk_file_chooser_get_uri(
+                                GTK_FILE_CHOOSER(dialog));
+                GdkPixbuf *buf = gnome_gdk_pixbuf_new_from_uri(file);
+#else
-                gchar *file = gtk_file_chooser_get_filename(
-                                GTK_FILE_CHOOSER(dialog));
-                GdkPixbuf *buf = gdk_pixbuf_new_from_file(file, NULL);
+#endif
-                gchar *sep = strrchr(file, '/');
-                GObject *source = g_object_get_data(G_OBJECT(text),