GNOME.org
 

[gthumb] Splitted the flickr and 23 uploaders in two separate extensions

commit e651525012d53f854465f9403388d701ff629f68
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Sep 11 12:42:25 2011 +0200

    Splitted the flickr and 23 uploaders in two separate extensions

 configure.ac                                       |    6 +-
 extensions/23hq/23hq.extension.in.in               |   13 +++
 extensions/23hq/Makefile.am                        |   31 ++++++
 extensions/23hq/actions.c                          |   67 ++++++++++++
 .../dlg-import-from-flickr.h => 23hq/actions.h}    |   17 ++--
 extensions/23hq/callbacks.c                        |  111 ++++++++++++++++++++
 .../dlg-import-from-flickr.h => 23hq/callbacks.h}  |   12 +--
 .../dlg-export-to-flickr.h => 23hq/main.c}         |   36 +++++--
 extensions/Makefile.am                             |    8 ++-
 extensions/facebook/facebook.extension.in.in       |    2 +-
 extensions/flicker/Makefile.am                     |   27 +-----
 extensions/flicker/actions.c                       |   45 +--------
 extensions/flicker/actions.h                       |    2 -
 extensions/flicker/callbacks.c                     |   15 ---
 extensions/flicker/flicker.extension.in.in         |    4 +-
 extensions/flicker_utils/Makefile.am               |   52 +++++++++
 .../{flicker => flicker_utils}/data/Makefile.am    |    0
 .../{flicker => flicker_utils}/data/ui/Makefile.am |    0
 .../data/ui/export-to-flickr.ui                    |    0
 .../data/ui/flicker-account-chooser.ui             |    0
 .../data/ui/flicker-account-manager.ui             |    0
 .../data/ui/flicker-ask-authorization.ui           |    0
 .../data/ui/flicker-complete-authorization.ui      |    0
 .../data/ui/flicker-export-completed.ui            |    0
 .../data/ui/import-from-flickr.ui                  |    0
 .../dlg-export-to-flickr.c                         |    4 +-
 .../dlg-export-to-flickr.h                         |    0
 .../dlg-import-from-flickr.c                       |    2 +-
 .../dlg-import-from-flickr.h                       |    0
 .../flicker_utils/flicker_utils.extension.in.in    |    7 ++
 .../flickr-account-chooser-dialog.c                |    2 +-
 .../flickr-account-chooser-dialog.h                |    0
 .../flickr-account-manager-dialog.c                |    2 +-
 .../flickr-account-manager-dialog.h                |    0
 .../{flicker => flicker_utils}/flickr-account.c    |    0
 .../{flicker => flicker_utils}/flickr-account.h    |    0
 .../flickr-authentication.c                        |    4 +-
 .../flickr-authentication.h                        |    0
 .../{flicker => flicker_utils}/flickr-connection.c |    2 +-
 .../{flicker => flicker_utils}/flickr-connection.h |    0
 .../{flicker => flicker_utils}/flickr-photo.c      |    0
 .../{flicker => flicker_utils}/flickr-photo.h      |    0
 .../{flicker => flicker_utils}/flickr-photoset.c   |    0
 .../{flicker => flicker_utils}/flickr-photoset.h   |    0
 .../{flicker => flicker_utils}/flickr-service.c    |    0
 .../{flicker => flicker_utils}/flickr-service.h    |    0
 .../{flicker => flicker_utils}/flickr-types.h      |    0
 .../{flicker => flicker_utils}/flickr-user.c       |    0
 .../{flicker => flicker_utils}/flickr-user.h       |    0
 .../main.c}                                        |   35 +++++--
 extensions/photobucket/photobucket.extension.in.in |    2 +-
 extensions/picasaweb/picasaweb.extension.in.in     |    2 +-
 gthumb/gth-main.c                                  |    3 +-
 53 files changed, 379 insertions(+), 134 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 595d9ba..def6579 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,6 +601,7 @@ data/ui/Makefile
 help/Makefile
 m4/Makefile
 extensions/Makefile
+extensions/23hq/Makefile
 extensions/bookmarks/Makefile
 extensions/bookmarks/data/Makefile
 extensions/bookmarks/data/ui/Makefile
@@ -644,9 +645,10 @@ extensions/file_viewer/Makefile
 extensions/find_duplicates/Makefile
 extensions/find_duplicates/data/Makefile
 extensions/find_duplicates/data/ui/Makefile
+extensions/flicker_utils/Makefile
+extensions/flicker_utils/data/Makefile
+extensions/flicker_utils/data/ui/Makefile
 extensions/flicker/Makefile
-extensions/flicker/data/Makefile
-extensions/flicker/data/ui/Makefile
 extensions/gstreamer_tools/Makefile
 extensions/gstreamer_tools/data/Makefile
 extensions/gstreamer_tools/data/ui/Makefile
diff --git a/extensions/23hq/23hq.extension.in.in b/extensions/23hq/23hq.extension.in.in
new file mode 100644
index 0000000..e2e3230
--- /dev/null
+++ b/extensions/23hq/23hq.extension.in.in
@@ -0,0 +1,13 @@
+[Extension]
+_Name=23
+_Description=Upload images to 23hq.com
+Authors=gthumb development team
+Copyright=Copyright  2011 The Free Software Foundation, Inc.
+Version=%VERSION%
+Icon=site-twentythree
+Category=Exporter
+
+[Loader]
+Type=module
+File=%LIBRARY%
+Requires=importer;export_tools;flicker_utils
diff --git a/extensions/23hq/Makefile.am b/extensions/23hq/Makefile.am
new file mode 100644
index 0000000..cdb429d
--- /dev/null
+++ b/extensions/23hq/Makefile.am
@@ -0,0 +1,31 @@
+if ENABLE_WEB_SERVICES
+
+extensiondir = $(pkglibdir)/extensions
+extension_LTLIBRARIES = lib23hq.la
+
+lib23hq_la_SOURCES = 		\
+	actions.c		\
+	actions.h		\
+	callbacks.c		\
+	callbacks.h		\
+	main.c
+
+lib23hq_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+lib23hq_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
+lib23hq_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la
+lib23hq_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
+
+extensioninidir = $(extensiondir)
+extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
+DISTCLEANFILES = $(extensionini_DATA)
+
+endif
+
+extensionini_in_files = 23hq.extension.in.in
+
+ GTHUMB_EXTENSION_IN_RULE@
+ GTHUMB_EXTENSION_RULE@
+
+EXTRA_DIST = $(extensionini_in_files)
+
+-include $(top_srcdir)/git.mk
diff --git a/extensions/23hq/actions.c b/extensions/23hq/actions.c
new file mode 100644
index 0000000..31dcb3d
--- /dev/null
+++ b/extensions/23hq/actions.c
@@ -0,0 +1,67 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ *  GThumb
+ *
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <config.h>
+#include <glib/gi18n.h>
+#include <gthumb.h>
+#include <extensions/flicker_utils/dlg-export-to-flickr.h>
+#include <extensions/flicker_utils/dlg-import-from-flickr.h>
+#include <extensions/flicker_utils/flickr-types.h>
+
+
+static FlickrServer www_23hq_com = {
+	"23",
+	"http://www.23hq.com";,
+	"http://www.23hq.com/services/auth/";,
+	"http://www.23hq.com/services/rest";,
+	"http://www.23hq.com/services/upload/";,
+	"www.23hq.com",
+	"8960706ee7f4151e893b11837e9c24ce",
+	"1ff8d1e45c873423",
+	TRUE
+};
+
+
+void
+gth_browser_activate_action_export_23 (GtkAction  *action,
+				       GthBrowser *browser)
+{
+	GList *items;
+	GList *file_list;
+
+	items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser)));
+	file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
+	if (file_list == NULL)
+		file_list = gth_file_store_get_visibles (gth_browser_get_file_store (browser));
+	dlg_export_to_flickr (&www_23hq_com, browser, file_list);
+
+	_g_object_list_unref (file_list);
+	_gtk_tree_path_list_free (items);
+}
+
+
+void
+gth_browser_activate_action_import_23 (GtkAction  *action,
+				       GthBrowser *browser)
+{
+	dlg_import_from_flickr (&www_23hq_com, browser);
+}
diff --git a/extensions/flicker/dlg-import-from-flickr.h b/extensions/23hq/actions.h
similarity index 71%
copy from extensions/flicker/dlg-import-from-flickr.h
copy to extensions/23hq/actions.h
index 0bbf35b..ff19ad7 100644
--- a/extensions/flicker/dlg-import-from-flickr.h
+++ b/extensions/23hq/actions.h
@@ -3,7 +3,7 @@
 /*
  *  GThumb
  *
- *  Copyright (C) 2010 The Free Software Foundation, Inc.
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,13 +19,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DLG_IMPORT_FROM_FLICKR_H
-#define DLG_IMPORT_FROM_FLICKR_H
+#ifndef ACTIONS_H
+#define ACTIONS_H
 
-#include <gthumb.h>
-#include "flickr-types.h"
+#include <gtk/gtk.h>
 
-void dlg_import_from_flickr (FlickrServer *server,
-			     GthBrowser   *browser);
+#define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data);
 
-#endif /* DLG_IMPORT_FROM_FLICKR_H */
+DEFINE_ACTION(gth_browser_activate_action_export_23)
+DEFINE_ACTION(gth_browser_activate_action_import_23)
+
+#endif /* ACTIONS_H */
diff --git a/extensions/23hq/callbacks.c b/extensions/23hq/callbacks.c
new file mode 100644
index 0000000..455edaf
--- /dev/null
+++ b/extensions/23hq/callbacks.c
@@ -0,0 +1,111 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ *  GThumb
+ *
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <config.h>
+#include <glib/gi18n.h>
+#include <glib-object.h>
+#include <gthumb.h>
+#include "actions.h"
+
+
+#define BROWSER_DATA_KEY "23hq-browser-data"
+
+
+static const char *ui_info =
+"<ui>"
+"  <menubar name='MenuBar'>"
+"    <menu name='File' action='FileMenu'>"
+"      <menu name='Import' action='ImportMenu'>"
+"        <placeholder name='Web_Services'>"
+"          <menuitem action='File_Import_23'/>"
+"        </placeholder>"
+"      </menu>"
+"      <menu name='Export' action='ExportMenu'>"
+"        <placeholder name='Web_Services'>"
+"          <menuitem action='File_Export_23'/>"
+"        </placeholder>"
+"      </menu>"
+"    </menu>"
+"  </menubar>"
+"  <popup name='ExportPopup'>"
+"    <placeholder name='Web_Services'>"
+"      <menuitem action='File_Export_23'/>"
+"    </placeholder>"
+"  </popup>"
+"</ui>";
+
+
+static GtkActionEntry action_entries[] = {
+	{ "File_Import_23", "site-twentythree",
+	  N_("_23..."), NULL,
+	  N_("Download photos from 23"),
+	  G_CALLBACK (gth_browser_activate_action_import_23) },
+	{ "File_Export_23", "site-twentythree",
+	  N_("_23..."), NULL,
+	  N_("Upload photos to 23"),
+	  G_CALLBACK (gth_browser_activate_action_export_23) },
+};
+
+
+typedef struct {
+	GtkActionGroup *action_group;
+} BrowserData;
+
+
+static void
+browser_data_free (BrowserData *data)
+{
+	g_free (data);
+}
+
+
+void
+tt__gth_browser_construct_cb (GthBrowser *browser)
+{
+	BrowserData *data;
+	GError      *error = NULL;
+	guint        merge_id;
+
+	g_return_if_fail (GTH_IS_BROWSER (browser));
+
+	data = g_new0 (BrowserData, 1);
+
+	data->action_group = gtk_action_group_new ("23HQ Actions");
+	gtk_action_group_set_translation_domain (data->action_group, NULL);
+	gtk_action_group_add_actions (data->action_group,
+				      action_entries,
+				      G_N_ELEMENTS (action_entries),
+				      browser);
+	gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0);
+
+	merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), ui_info, -1, &error);
+	if (merge_id == 0) {
+		g_warning ("building ui failed: %s", error->message);
+		g_clear_error (&error);
+	}
+
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Import/Web_Services/File_Import_23")), TRUE);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_23")), TRUE);
+	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_23")), TRUE);
+
+	g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free);
+}
diff --git a/extensions/flicker/dlg-import-from-flickr.h b/extensions/23hq/callbacks.h
similarity index 74%
copy from extensions/flicker/dlg-import-from-flickr.h
copy to extensions/23hq/callbacks.h
index 0bbf35b..62d44a4 100644
--- a/extensions/flicker/dlg-import-from-flickr.h
+++ b/extensions/23hq/callbacks.h
@@ -3,7 +3,7 @@
 /*
  *  GThumb
  *
- *  Copyright (C) 2010 The Free Software Foundation, Inc.
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,13 +19,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DLG_IMPORT_FROM_FLICKR_H
-#define DLG_IMPORT_FROM_FLICKR_H
+#ifndef CALLBACKS_H
+#define CALLBACKS_H
 
 #include <gthumb.h>
-#include "flickr-types.h"
 
-void dlg_import_from_flickr (FlickrServer *server,
-			     GthBrowser   *browser);
+void tt__gth_browser_construct_cb (GthBrowser *browser);
 
-#endif /* DLG_IMPORT_FROM_FLICKR_H */
+#endif /* CALLBACKS_H */
diff --git a/extensions/flicker/dlg-export-to-flickr.h b/extensions/23hq/main.c
similarity index 60%
copy from extensions/flicker/dlg-export-to-flickr.h
copy to extensions/23hq/main.c
index 9cef7bf..32a9a01 100644
--- a/extensions/flicker/dlg-export-to-flickr.h
+++ b/extensions/23hq/main.c
@@ -3,7 +3,7 @@
 /*
  *  GThumb
  *
- *  Copyright (C) 2010 The Free Software Foundation, Inc.
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,14 +19,34 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DLG_EXPORT_TO_FLICKR_H
-#define DLG_EXPORT_TO_FLICKR_H
 
+#include <config.h>
+#include <gtk/gtk.h>
 #include <gthumb.h>
-#include "flickr-types.h"
+#include "callbacks.h"
 
-void dlg_export_to_flickr (FlickrServer *server,
-			   GthBrowser   *browser,
-			   GList        *file_list);
 
-#endif /* DLG_EXPORT_TO_FLICKR_H */
+G_MODULE_EXPORT void
+gthumb_extension_activate (void)
+{
+	gth_hook_add_callback ("gth-browser-construct", 10, G_CALLBACK (tt__gth_browser_construct_cb), NULL);
+}
+
+
+G_MODULE_EXPORT void
+gthumb_extension_deactivate (void)
+{
+}
+
+
+G_MODULE_EXPORT gboolean
+gthumb_extension_is_configurable (void)
+{
+	return FALSE;
+}
+
+
+G_MODULE_EXPORT void
+gthumb_extension_configure (GtkWindow *parent)
+{
+}
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 145412f..20ecbdc 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,9 +1,15 @@
+FLICKR_EXPORTERS = 		\
+	23hq			\
+	flicker			\
+	$(NULL)	
+	
 EXPORTERS = 			\
 	export_tools		\
 	burn_disc		\
 	contact_sheet		\
 	facebook		\
-	flicker			\
+	flicker_utils		\
+	$(FLICKR_EXPORTERS)	\
 	photobucket		\
 	picasaweb		\
 	webalbums		\
diff --git a/extensions/facebook/facebook.extension.in.in b/extensions/facebook/facebook.extension.in.in
index 4f99239..6523911 100644
--- a/extensions/facebook/facebook.extension.in.in
+++ b/extensions/facebook/facebook.extension.in.in
@@ -4,7 +4,7 @@ _Description=Upload images to Facebook
 Authors=gthumb development team
 Copyright=Copyright  2010 The Free Software Foundation, Inc.
 Version=%VERSION%
-Icon=facebook
+Icon=site-facebook
 Category=Exporter
 
 [Loader]
diff --git a/extensions/flicker/Makefile.am b/extensions/flicker/Makefile.am
index 9616bbb..e3c022b 100644
--- a/extensions/flicker/Makefile.am
+++ b/extensions/flicker/Makefile.am
@@ -1,7 +1,5 @@
 if ENABLE_WEB_SERVICES
 
-SUBDIRS = data
-
 extensiondir = $(pkglibdir)/extensions
 extension_LTLIBRARIES = libflicker.la
 
@@ -10,34 +8,11 @@ libflicker_la_SOURCES = 			\
 	actions.h				\
 	callbacks.c				\
 	callbacks.h				\
-	dlg-export-to-flickr.c			\
-	dlg-export-to-flickr.h			\
-	dlg-import-from-flickr.c		\
-	dlg-import-from-flickr.h		\
-	flickr-account.c			\
-	flickr-account.h			\
-	flickr-account-chooser-dialog.c		\
-	flickr-account-chooser-dialog.h		\
-	flickr-account-manager-dialog.c		\
-	flickr-account-manager-dialog.h		\
-	flickr-authentication.c			\
-	flickr-authentication.h			\
-	flickr-connection.c			\
-	flickr-connection.h			\
-	flickr-photo.c				\
-	flickr-photo.h				\
-	flickr-photoset.c			\
-	flickr-photoset.h			\
-	flickr-service.c			\
-	flickr-service.h			\
-	flickr-types.h				\
-	flickr-user.c				\
-	flickr-user.h				\
 	main.c
 
 libflicker_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
 libflicker_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libflicker_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la
+libflicker_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la ../flicker_utils/libflicker_utils.la
 libflicker_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
diff --git a/extensions/flicker/actions.c b/extensions/flicker/actions.c
index 356fb3b..1e180ff 100644
--- a/extensions/flicker/actions.c
+++ b/extensions/flicker/actions.c
@@ -23,9 +23,9 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <gthumb.h>
-#include "dlg-export-to-flickr.h"
-#include "dlg-import-from-flickr.h"
-#include "flickr-types.h"
+#include <extensions/flicker_utils/dlg-export-to-flickr.h>
+#include <extensions/flicker_utils/dlg-import-from-flickr.h>
+#include <extensions/flicker_utils/flickr-types.h>
 
 
 static FlickrServer www_flickr_com = {
@@ -41,19 +41,6 @@ static FlickrServer www_flickr_com = {
 };
 
 
-static FlickrServer www_23hq_com = {
-	"23",
-	"http://www.23hq.com";,
-	"http://www.23hq.com/services/auth/";,
-	"http://www.23hq.com/services/rest";,
-	"http://www.23hq.com/services/upload/";,
-	"www.23hq.com",
-	"8960706ee7f4151e893b11837e9c24ce",
-	"1ff8d1e45c873423",
-	TRUE
-};
-
-
 void
 gth_browser_activate_action_export_flicker (GtkAction  *action,
 					    GthBrowser *browser)
@@ -78,29 +65,3 @@ gth_browser_activate_action_import_flicker (GtkAction  *action,
 {
 	dlg_import_from_flickr (&www_flickr_com, browser);
 }
-
-
-void
-gth_browser_activate_action_export_23 (GtkAction  *action,
-				       GthBrowser *browser)
-{
-	GList *items;
-	GList *file_list;
-
-	items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser)));
-	file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
-	if (file_list == NULL)
-		file_list = gth_file_store_get_visibles (gth_browser_get_file_store (browser));
-	dlg_export_to_flickr (&www_23hq_com, browser, file_list);
-
-	_g_object_list_unref (file_list);
-	_gtk_tree_path_list_free (items);
-}
-
-
-void
-gth_browser_activate_action_import_23 (GtkAction  *action,
-				       GthBrowser *browser)
-{
-	dlg_import_from_flickr (&www_23hq_com, browser);
-}
diff --git a/extensions/flicker/actions.h b/extensions/flicker/actions.h
index 100da01..6edd033 100644
--- a/extensions/flicker/actions.h
+++ b/extensions/flicker/actions.h
@@ -28,7 +28,5 @@
 
 DEFINE_ACTION(gth_browser_activate_action_export_flicker)
 DEFINE_ACTION(gth_browser_activate_action_import_flicker)
-DEFINE_ACTION(gth_browser_activate_action_export_23)
-DEFINE_ACTION(gth_browser_activate_action_import_23)
 
 #endif /* ACTIONS_H */
diff --git a/extensions/flicker/callbacks.c b/extensions/flicker/callbacks.c
index dd5d66b..5418aa3 100644
--- a/extensions/flicker/callbacks.c
+++ b/extensions/flicker/callbacks.c
@@ -37,13 +37,11 @@ static const char *ui_info =
 "      <menu name='Import' action='ImportMenu'>"
 "        <placeholder name='Web_Services'>"
 "          <menuitem action='File_Import_Flicker'/>"
-"          <menuitem action='File_Import_23'/>"
 "        </placeholder>"
 "      </menu>"
 "      <menu name='Export' action='ExportMenu'>"
 "        <placeholder name='Web_Services'>"
 "          <menuitem action='File_Export_Flicker'/>"
-"          <menuitem action='File_Export_23'/>"
 "        </placeholder>"
 "      </menu>"
 "    </menu>"
@@ -51,7 +49,6 @@ static const char *ui_info =
 "  <popup name='ExportPopup'>"
 "    <placeholder name='Web_Services'>"
 "      <menuitem action='File_Export_Flicker'/>"
-"      <menuitem action='File_Export_23'/>"
 "    </placeholder>"
 "  </popup>"
 "</ui>";
@@ -66,14 +63,6 @@ static GtkActionEntry action_entries[] = {
 	  N_("_Flickr..."), NULL,
 	  N_("Upload photos to Flickr"),
 	  G_CALLBACK (gth_browser_activate_action_export_flicker) },
-	{ "File_Import_23", "site-twentythree",
-	  N_("_23..."), NULL,
-	  N_("Download photos from 23"),
-	  G_CALLBACK (gth_browser_activate_action_import_23) },
-	{ "File_Export_23", "site-twentythree",
-	  N_("_23..."), NULL,
-	  N_("Upload photos to 23"),
-	  G_CALLBACK (gth_browser_activate_action_export_23) },
 };
 
 
@@ -118,9 +107,5 @@ fl__gth_browser_construct_cb (GthBrowser *browser)
 	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_Flicker")), TRUE);
 	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_Flicker")), TRUE);
 
-	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Import/Web_Services/File_Import_23")), TRUE);
-	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_23")), TRUE);
-	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_23")), TRUE);
-
 	g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free);
 }
diff --git a/extensions/flicker/flicker.extension.in.in b/extensions/flicker/flicker.extension.in.in
index 45c8315..4d39bb7 100644
--- a/extensions/flicker/flicker.extension.in.in
+++ b/extensions/flicker/flicker.extension.in.in
@@ -4,10 +4,10 @@ _Description=Upload images to Flickr
 Authors=gthumb development team
 Copyright=Copyright  2010 The Free Software Foundation, Inc.
 Version=%VERSION%
-Icon=flickr
+Icon=site-flickr
 Category=Exporter
 
 [Loader]
 Type=module
 File=%LIBRARY%
-Requires=importer;export_tools
+Requires=importer;export_tools;flicker_utils
diff --git a/extensions/flicker_utils/Makefile.am b/extensions/flicker_utils/Makefile.am
new file mode 100644
index 0000000..8da4b15
--- /dev/null
+++ b/extensions/flicker_utils/Makefile.am
@@ -0,0 +1,52 @@
+if ENABLE_WEB_SERVICES
+
+SUBDIRS = data
+
+extensiondir = $(pkglibdir)/extensions
+extension_LTLIBRARIES = libflicker_utils.la
+
+libflicker_utils_la_SOURCES = 			\
+	dlg-export-to-flickr.c			\
+	dlg-export-to-flickr.h			\
+	dlg-import-from-flickr.c		\
+	dlg-import-from-flickr.h		\
+	flickr-account.c			\
+	flickr-account.h			\
+	flickr-account-chooser-dialog.c		\
+	flickr-account-chooser-dialog.h		\
+	flickr-account-manager-dialog.c		\
+	flickr-account-manager-dialog.h		\
+	flickr-authentication.c			\
+	flickr-authentication.h			\
+	flickr-connection.c			\
+	flickr-connection.h			\
+	flickr-photo.c				\
+	flickr-photo.h				\
+	flickr-photoset.c			\
+	flickr-photoset.h			\
+	flickr-service.c			\
+	flickr-service.h			\
+	flickr-types.h				\
+	flickr-user.c				\
+	flickr-user.h				\
+	main.c
+
+libflicker_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(LIBSOUP_CFLAGS) $(GNOME_KEYRING_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libflicker_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
+libflicker_utils_la_LIBADD = $(GTHUMB_LIBS) $(LIBSOUP_LIBS) $(GNOME_KEYRING_LIBS) ../importer/libimporter.la ../export_tools/libexport_tools.la
+libflicker_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
+
+extensioninidir = $(extensiondir)
+extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
+DISTCLEANFILES = $(extensionini_DATA)
+
+endif
+
+extensionini_in_files = flicker_utils.extension.in.in
+
+ GTHUMB_EXTENSION_IN_RULE@
+ GTHUMB_EXTENSION_RULE@
+
+EXTRA_DIST = $(extensionini_in_files)
+
+-include $(top_srcdir)/git.mk
diff --git a/extensions/flicker/data/Makefile.am b/extensions/flicker_utils/data/Makefile.am
similarity index 100%
rename from extensions/flicker/data/Makefile.am
rename to extensions/flicker_utils/data/Makefile.am
diff --git a/extensions/flicker/data/ui/Makefile.am b/extensions/flicker_utils/data/ui/Makefile.am
similarity index 100%
rename from extensions/flicker/data/ui/Makefile.am
rename to extensions/flicker_utils/data/ui/Makefile.am
diff --git a/extensions/flicker/data/ui/export-to-flickr.ui b/extensions/flicker_utils/data/ui/export-to-flickr.ui
similarity index 100%
rename from extensions/flicker/data/ui/export-to-flickr.ui
rename to extensions/flicker_utils/data/ui/export-to-flickr.ui
diff --git a/extensions/flicker/data/ui/flicker-account-chooser.ui b/extensions/flicker_utils/data/ui/flicker-account-chooser.ui
similarity index 100%
rename from extensions/flicker/data/ui/flicker-account-chooser.ui
rename to extensions/flicker_utils/data/ui/flicker-account-chooser.ui
diff --git a/extensions/flicker/data/ui/flicker-account-manager.ui b/extensions/flicker_utils/data/ui/flicker-account-manager.ui
similarity index 100%
rename from extensions/flicker/data/ui/flicker-account-manager.ui
rename to extensions/flicker_utils/data/ui/flicker-account-manager.ui
diff --git a/extensions/flicker/data/ui/flicker-ask-authorization.ui b/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui
similarity index 100%
rename from extensions/flicker/data/ui/flicker-ask-authorization.ui
rename to extensions/flicker_utils/data/ui/flicker-ask-authorization.ui
diff --git a/extensions/flicker/data/ui/flicker-complete-authorization.ui b/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui
similarity index 100%
rename from extensions/flicker/data/ui/flicker-complete-authorization.ui
rename to extensions/flicker_utils/data/ui/flicker-complete-authorization.ui
diff --git a/extensions/flicker/data/ui/flicker-export-completed.ui b/extensions/flicker_utils/data/ui/flicker-export-completed.ui
similarity index 100%
rename from extensions/flicker/data/ui/flicker-export-completed.ui
rename to extensions/flicker_utils/data/ui/flicker-export-completed.ui
diff --git a/extensions/flicker/data/ui/import-from-flickr.ui b/extensions/flicker_utils/data/ui/import-from-flickr.ui
similarity index 100%
rename from extensions/flicker/data/ui/import-from-flickr.ui
rename to extensions/flicker_utils/data/ui/import-from-flickr.ui
diff --git a/extensions/flicker/dlg-export-to-flickr.c b/extensions/flicker_utils/dlg-export-to-flickr.c
similarity index 99%
rename from extensions/flicker/dlg-export-to-flickr.c
rename to extensions/flicker_utils/dlg-export-to-flickr.c
index 82079df..4650f8b 100644
--- a/extensions/flicker/dlg-export-to-flickr.c
+++ b/extensions/flicker_utils/dlg-export-to-flickr.c
@@ -158,7 +158,7 @@ export_completed_with_success (DialogData *data)
 
 	gth_task_dialog (GTH_TASK (data->conn), TRUE, NULL);
 
-	builder = _gtk_builder_new_from_file ("flicker-export-completed.ui", "flicker");
+	builder = _gtk_builder_new_from_file ("flicker-export-completed.ui", "flicker_utils");
 	dialog = _gtk_builder_get_widget (builder, "completed_messagedialog");
 	g_object_set_data_full (G_OBJECT (dialog), "builder", builder, g_object_unref);
 	g_signal_connect (dialog,
@@ -496,7 +496,7 @@ dlg_export_to_flickr (FlickrServer *server,
 	data->server = server;
 	data->browser = browser;
 	data->location = gth_file_data_dup (gth_browser_get_location_data (browser));
-	data->builder = _gtk_builder_new_from_file ("export-to-flickr.ui", "flicker");
+	data->builder = _gtk_builder_new_from_file ("export-to-flickr.ui", "flicker_utils");
 	data->dialog = _gtk_builder_get_widget (data->builder, "export_dialog");
 	data->cancellable = g_cancellable_new ();
 
diff --git a/extensions/flicker/dlg-export-to-flickr.h b/extensions/flicker_utils/dlg-export-to-flickr.h
similarity index 100%
copy from extensions/flicker/dlg-export-to-flickr.h
copy to extensions/flicker_utils/dlg-export-to-flickr.h
diff --git a/extensions/flicker/dlg-import-from-flickr.c b/extensions/flicker_utils/dlg-import-from-flickr.c
similarity index 99%
rename from extensions/flicker/dlg-import-from-flickr.c
rename to extensions/flicker_utils/dlg-import-from-flickr.c
index 7e75134..0120071 100644
--- a/extensions/flicker/dlg-import-from-flickr.c
+++ b/extensions/flicker_utils/dlg-import-from-flickr.c
@@ -515,7 +515,7 @@ dlg_import_from_flickr (FlickrServer *server,
 	data->server = server;
 	data->browser = browser;
 	data->location = gth_file_data_dup (gth_browser_get_location_data (browser));
-	data->builder = _gtk_builder_new_from_file ("import-from-flickr.ui", "flicker");
+	data->builder = _gtk_builder_new_from_file ("import-from-flickr.ui", "flicker_utils");
 	data->dialog = _gtk_builder_get_widget (data->builder, "import_dialog");
 	data->cancellable = g_cancellable_new ();
 
diff --git a/extensions/flicker/dlg-import-from-flickr.h b/extensions/flicker_utils/dlg-import-from-flickr.h
similarity index 100%
rename from extensions/flicker/dlg-import-from-flickr.h
rename to extensions/flicker_utils/dlg-import-from-flickr.h
diff --git a/extensions/flicker_utils/flicker_utils.extension.in.in b/extensions/flicker_utils/flicker_utils.extension.in.in
new file mode 100644
index 0000000..9c4130e
--- /dev/null
+++ b/extensions/flicker_utils/flicker_utils.extension.in.in
@@ -0,0 +1,7 @@
+[Extension]
+Hidden=true
+
+[Loader]
+Type=module
+File=%LIBRARY%
+Requires=importer;export_tools
diff --git a/extensions/flicker/flickr-account-chooser-dialog.c b/extensions/flicker_utils/flickr-account-chooser-dialog.c
similarity index 99%
rename from extensions/flicker/flickr-account-chooser-dialog.c
rename to extensions/flicker_utils/flickr-account-chooser-dialog.c
index d98231e..3b2bc21 100644
--- a/extensions/flicker/flickr-account-chooser-dialog.c
+++ b/extensions/flicker_utils/flickr-account-chooser-dialog.c
@@ -113,7 +113,7 @@ flickr_account_chooser_dialog_init (FlickrAccountChooserDialog *self)
 	GtkWidget *content;
 
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_ACCOUNT_CHOOSER_DIALOG, FlickrAccountChooserDialogPrivate);
-	self->priv->builder = _gtk_builder_new_from_file ("flicker-account-chooser.ui", "flicker");
+	self->priv->builder = _gtk_builder_new_from_file ("flicker-account-chooser.ui", "flicker_utils");
 
 	gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
 	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5);
diff --git a/extensions/flicker/flickr-account-chooser-dialog.h b/extensions/flicker_utils/flickr-account-chooser-dialog.h
similarity index 100%
rename from extensions/flicker/flickr-account-chooser-dialog.h
rename to extensions/flicker_utils/flickr-account-chooser-dialog.h
diff --git a/extensions/flicker/flickr-account-manager-dialog.c b/extensions/flicker_utils/flickr-account-manager-dialog.c
similarity index 99%
rename from extensions/flicker/flickr-account-manager-dialog.c
rename to extensions/flicker_utils/flickr-account-manager-dialog.c
index 7f151e0..bbb83a1 100644
--- a/extensions/flicker/flickr-account-manager-dialog.c
+++ b/extensions/flicker_utils/flickr-account-manager-dialog.c
@@ -127,7 +127,7 @@ flickr_account_manager_dialog_init (FlickrAccountManagerDialog *self)
 	GtkWidget *content;
 
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FLICKR_TYPE_ACCOUNT_MANAGER_DIALOG, FlickrAccountManagerDialogPrivate);
-	self->priv->builder = _gtk_builder_new_from_file ("flicker-account-manager.ui", "flicker");
+	self->priv->builder = _gtk_builder_new_from_file ("flicker-account-manager.ui", "flicker_utils");
 
 	gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
 	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5);
diff --git a/extensions/flicker/flickr-account-manager-dialog.h b/extensions/flicker_utils/flickr-account-manager-dialog.h
similarity index 100%
rename from extensions/flicker/flickr-account-manager-dialog.h
rename to extensions/flicker_utils/flickr-account-manager-dialog.h
diff --git a/extensions/flicker/flickr-account.c b/extensions/flicker_utils/flickr-account.c
similarity index 100%
rename from extensions/flicker/flickr-account.c
rename to extensions/flicker_utils/flickr-account.c
diff --git a/extensions/flicker/flickr-account.h b/extensions/flicker_utils/flickr-account.h
similarity index 100%
rename from extensions/flicker/flickr-account.h
rename to extensions/flicker_utils/flickr-account.h
diff --git a/extensions/flicker/flickr-authentication.c b/extensions/flicker_utils/flickr-authentication.c
similarity index 99%
rename from extensions/flicker/flickr-authentication.c
rename to extensions/flicker_utils/flickr-authentication.c
index 2365a2d..d8e1e96 100644
--- a/extensions/flicker/flickr-authentication.c
+++ b/extensions/flicker_utils/flickr-authentication.c
@@ -432,7 +432,7 @@ complete_authorization (FlickrAuthentication *self)
 
 	gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL);
 
-	builder = _gtk_builder_new_from_file ("flicker-complete-authorization.ui", "flicker");
+	builder = _gtk_builder_new_from_file ("flicker-complete-authorization.ui", "flicker_utils");
 	dialog = _gtk_builder_get_widget (builder, "complete_authorization_messagedialog");
 	text = g_strdup_printf (_("Return to this window when you have finished the authorization process on %s"), self->priv->conn->server->name);
 	secondary_text = g_strdup (_("Once you're done, click the 'Continue' button below."));
@@ -512,7 +512,7 @@ ask_authorization (FlickrAuthentication *self)
 
 	gth_task_dialog (GTH_TASK (self->priv->conn), TRUE, NULL);
 
-	builder = _gtk_builder_new_from_file ("flicker-ask-authorization.ui", "flicker");
+	builder = _gtk_builder_new_from_file ("flicker-ask-authorization.ui", "flicker_utils");
 	dialog = _gtk_builder_get_widget (builder, "ask_authorization_messagedialog");
 	text = g_strdup_printf (_("gthumb requires your authorization to upload the photos to %s"), self->priv->conn->server->name);
 	secondary_text = g_strdup_printf (_("Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization."), self->priv->conn->server->name);
diff --git a/extensions/flicker/flickr-authentication.h b/extensions/flicker_utils/flickr-authentication.h
similarity index 100%
rename from extensions/flicker/flickr-authentication.h
rename to extensions/flicker_utils/flickr-authentication.h
diff --git a/extensions/flicker/flickr-connection.c b/extensions/flicker_utils/flickr-connection.c
similarity index 99%
rename from extensions/flicker/flickr-connection.c
rename to extensions/flicker_utils/flickr-connection.c
index c85b8b2..d2a5c63 100644
--- a/extensions/flicker/flickr-connection.c
+++ b/extensions/flicker_utils/flickr-connection.c
@@ -27,7 +27,7 @@
 #include "flickr-user.h"
 
 
-#define DEBUG_FLICKR_CONNECTION 1
+#undef DEBUG_FLICKR_CONNECTION
 
 
 GQuark
diff --git a/extensions/flicker/flickr-connection.h b/extensions/flicker_utils/flickr-connection.h
similarity index 100%
rename from extensions/flicker/flickr-connection.h
rename to extensions/flicker_utils/flickr-connection.h
diff --git a/extensions/flicker/flickr-photo.c b/extensions/flicker_utils/flickr-photo.c
similarity index 100%
rename from extensions/flicker/flickr-photo.c
rename to extensions/flicker_utils/flickr-photo.c
diff --git a/extensions/flicker/flickr-photo.h b/extensions/flicker_utils/flickr-photo.h
similarity index 100%
rename from extensions/flicker/flickr-photo.h
rename to extensions/flicker_utils/flickr-photo.h
diff --git a/extensions/flicker/flickr-photoset.c b/extensions/flicker_utils/flickr-photoset.c
similarity index 100%
rename from extensions/flicker/flickr-photoset.c
rename to extensions/flicker_utils/flickr-photoset.c
diff --git a/extensions/flicker/flickr-photoset.h b/extensions/flicker_utils/flickr-photoset.h
similarity index 100%
rename from extensions/flicker/flickr-photoset.h
rename to extensions/flicker_utils/flickr-photoset.h
diff --git a/extensions/flicker/flickr-service.c b/extensions/flicker_utils/flickr-service.c
similarity index 100%
rename from extensions/flicker/flickr-service.c
rename to extensions/flicker_utils/flickr-service.c
diff --git a/extensions/flicker/flickr-service.h b/extensions/flicker_utils/flickr-service.h
similarity index 100%
rename from extensions/flicker/flickr-service.h
rename to extensions/flicker_utils/flickr-service.h
diff --git a/extensions/flicker/flickr-types.h b/extensions/flicker_utils/flickr-types.h
similarity index 100%
rename from extensions/flicker/flickr-types.h
rename to extensions/flicker_utils/flickr-types.h
diff --git a/extensions/flicker/flickr-user.c b/extensions/flicker_utils/flickr-user.c
similarity index 100%
rename from extensions/flicker/flickr-user.c
rename to extensions/flicker_utils/flickr-user.c
diff --git a/extensions/flicker/flickr-user.h b/extensions/flicker_utils/flickr-user.h
similarity index 100%
rename from extensions/flicker/flickr-user.h
rename to extensions/flicker_utils/flickr-user.h
diff --git a/extensions/flicker/dlg-export-to-flickr.h b/extensions/flicker_utils/main.c
similarity index 66%
rename from extensions/flicker/dlg-export-to-flickr.h
rename to extensions/flicker_utils/main.c
index 9cef7bf..1d8f4a4 100644
--- a/extensions/flicker/dlg-export-to-flickr.h
+++ b/extensions/flicker_utils/main.c
@@ -3,7 +3,7 @@
 /*
  *  GThumb
  *
- *  Copyright (C) 2010 The Free Software Foundation, Inc.
+ *  Copyright (C) 2010 Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,14 +19,31 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DLG_EXPORT_TO_FLICKR_H
-#define DLG_EXPORT_TO_FLICKR_H
 
-#include <gthumb.h>
-#include "flickr-types.h"
+#include <config.h>
+#include <gtk/gtk.h>
 
-void dlg_export_to_flickr (FlickrServer *server,
-			   GthBrowser   *browser,
-			   GList        *file_list);
 
-#endif /* DLG_EXPORT_TO_FLICKR_H */
+G_MODULE_EXPORT void
+gthumb_extension_activate (void)
+{
+}
+
+
+G_MODULE_EXPORT void
+gthumb_extension_deactivate (void)
+{
+}
+
+
+G_MODULE_EXPORT gboolean
+gthumb_extension_is_configurable (void)
+{
+	return FALSE;
+}
+
+
+G_MODULE_EXPORT void
+gthumb_extension_configure (GtkWindow *parent)
+{
+}
diff --git a/extensions/photobucket/photobucket.extension.in.in b/extensions/photobucket/photobucket.extension.in.in
index 96e1edf..da43242 100644
--- a/extensions/photobucket/photobucket.extension.in.in
+++ b/extensions/photobucket/photobucket.extension.in.in
@@ -4,7 +4,7 @@ _Description=Upload images to PhotoBucket
 Authors=gthumb development team
 Copyright=Copyright  2010 The Free Software Foundation, Inc.
 Version=%VERSION%
-Icon=photobucket
+Icon=site-photobucket
 Category=Exporter
 
 [Loader]
diff --git a/extensions/picasaweb/picasaweb.extension.in.in b/extensions/picasaweb/picasaweb.extension.in.in
index c3970f6..13c02dc 100644
--- a/extensions/picasaweb/picasaweb.extension.in.in
+++ b/extensions/picasaweb/picasaweb.extension.in.in
@@ -4,7 +4,7 @@ _Description=Upload images to Picasa Web Albums
 Authors=gthumb development team
 Copyright=Copyright  2010 The Free Software Foundation, Inc.
 Version=%VERSION%
-Icon=picasaweb
+Icon=site-picasaweb
 Category=Exporter
 
 [Loader]
diff --git a/gthumb/gth-main.c b/gthumb/gth-main.c
index 593e00d..f144c78 100644
--- a/gthumb/gth-main.c
+++ b/gthumb/gth-main.c
@@ -1206,7 +1206,8 @@ gth_main_activate_extensions (void)
 	const char *mandatory_extensions[] = {	"file_viewer",
 						"cairo_io",
 						NULL };
-	const char *default_extensions[] = {	"bookmarks",
+	const char *default_extensions[] = {	"23hq",
+						"bookmarks",
 						"burn_disc",
 						"catalogs",
 						"change_date",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]