diff --git a/Makefile.in b/Makefile.in index 432edaa..8496146 100644 --- a/Makefile.in +++ b/Makefile.in @@ -201,8 +201,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_DEPENDENCIES = am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo \ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.lo \ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo \ - plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo \ - plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = $(am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK = \ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -214,10 +212,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK = \ plugins_shotwell_publishing_shotwell_publishing_la_DEPENDENCIES = \ $(top_builddir)/plugins/common/libshotwell-plugin-common.la am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo \ - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo \ - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo \ - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo \ - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo \ plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = $(am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS) plugins_shotwell_publishing_shotwell_publishing_la_LINK = $(LIBTOOL) \ @@ -604,14 +598,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ plugins/shotwell-data-imports/shotwell-data-imports.c \ plugins/shotwell-publishing-extras/GalleryConnector.c \ plugins/shotwell-publishing-extras/RajcePublishing.c \ - plugins/shotwell-publishing-extras/TumblrPublishing.c \ - plugins/shotwell-publishing-extras/YandexPublishing.c \ plugins/shotwell-publishing-extras/shotwell-publishing-extras.c \ - plugins/shotwell-publishing/FacebookPublishing.c \ - plugins/shotwell-publishing/FlickrPublishing.c \ - plugins/shotwell-publishing/PicasaPublishing.c \ plugins/shotwell-publishing/PiwigoPublishing.c \ - plugins/shotwell-publishing/YouTubePublishing.c \ plugins/shotwell-publishing/shotwell-publishing.c \ plugins/shotwell-transitions/BlindsEffect.c \ plugins/shotwell-transitions/ChessEffect.c \ @@ -1029,18 +1017,9 @@ plugin_LTLIBRARIES = \ plugins/shotwell-publishing-extras/shotwell-publishing-extras.la \ plugins/shotwell-transitions/shotwell-transitions.la \ plugins/shotwell-data-imports/shotwell-data-imports.la -dist_plugin_DATA = plugins/shotwell-publishing/facebook.png \ - plugins/shotwell-publishing/flickr.png \ - plugins/shotwell-publishing/picasa.png \ - plugins/shotwell-publishing/piwigo.png \ - plugins/shotwell-publishing/youtube.png \ - plugins/shotwell-publishing/facebook_publishing_options_pane.ui \ - plugins/shotwell-publishing/flickr_pin_entry_pane.ui \ - plugins/shotwell-publishing/flickr_publishing_options_pane.ui \ - plugins/shotwell-publishing/picasa_publishing_options_pane.ui \ +dist_plugin_DATA = plugins/shotwell-publishing/piwigo.png \ plugins/shotwell-publishing/piwigo_authentication_pane.ui \ plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \ - plugins/shotwell-publishing/youtube_publishing_options_pane.ui \ plugins/shotwell-publishing-extras/gallery3.png \ plugins/shotwell-publishing-extras/rajce.png \ plugins/shotwell-publishing-extras/tumblr.png \ @@ -1048,9 +1027,6 @@ dist_plugin_DATA = plugins/shotwell-publishing/facebook.png \ plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \ plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \ plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \ - plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \ - plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \ - plugins/shotwell-publishing-extras/yandex_publish_model.ui \ plugins/shotwell-transitions/slideshow-plugin.png \ plugins/shotwell-data-imports/f-spot-24.png dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator @@ -1288,10 +1264,6 @@ thumbnailer_shotwell_video_thumbnailer_CFLAGS = $(THUMBNAILER_CFLAGS) thumbnailer_shotwell_video_thumbnailer_LDADD = $(THUMBNAILER_LIBS) plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \ plugins/shotwell-publishing/shotwell-publishing.vala \ - plugins/shotwell-publishing/FacebookPublishing.vala \ - plugins/shotwell-publishing/PicasaPublishing.vala \ - plugins/shotwell-publishing/FlickrPublishing.vala \ - plugins/shotwell-publishing/YouTubePublishing.vala \ plugins/shotwell-publishing/PiwigoPublishing.vala \ plugins/shotwell-plugin-common.vapi @@ -1323,8 +1295,6 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \ plugins/shotwell-publishing-extras/GalleryConnector.vala \ plugins/shotwell-publishing-extras/RajcePublishing.vala \ plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \ - plugins/shotwell-publishing-extras/TumblrPublishing.vala \ - plugins/shotwell-publishing-extras/YandexPublishing.vala \ plugins/shotwell-plugin-common.vapi plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \ @@ -1663,12 +1633,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo: \ plugins/shotwell-publishing-extras/$(am__dirstamp) \ plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) -plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo: \ - plugins/shotwell-publishing-extras/$(am__dirstamp) \ - plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) -plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo: \ - plugins/shotwell-publishing-extras/$(am__dirstamp) \ - plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) plugins/shotwell-publishing-extras/shotwell-publishing-extras.la: $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_DEPENDENCIES) $(EXTRA_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_DEPENDENCIES) plugins/shotwell-publishing-extras/$(am__dirstamp) $(AM_V_CCLD)$(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK) -rpath $(plugindir) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LIBADD) $(LIBS) @@ -1681,18 +1645,6 @@ plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp): plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo: \ plugins/shotwell-publishing/$(am__dirstamp) \ plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo: \ - plugins/shotwell-publishing/$(am__dirstamp) \ - plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo: \ - plugins/shotwell-publishing/$(am__dirstamp) \ - plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo: \ - plugins/shotwell-publishing/$(am__dirstamp) \ - plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo: \ - plugins/shotwell-publishing/$(am__dirstamp) \ - plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo: \ plugins/shotwell-publishing/$(am__dirstamp) \ plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) @@ -2541,14 +2493,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-transitions/$(DEPDIR)/plugins_shotwell_transitions_shotwell_transitions_la-BlindsEffect.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-transitions/$(DEPDIR)/plugins_shotwell_transitions_shotwell_transitions_la-ChessEffect.Plo@am__quote@ @@ -2915,20 +2861,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo `test -f 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/shotwell-publishing-extras.c -plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo: plugins/shotwell-publishing-extras/TumblrPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing-extras/TumblrPublishing.c' object='plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c - -plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo: plugins/shotwell-publishing-extras/YandexPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo `test -f 'plugins/shotwell-publishing-extras/YandexPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/YandexPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing-extras/YandexPublishing.c' object='plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo `test -f 'plugins/shotwell-publishing-extras/YandexPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/YandexPublishing.c - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo: plugins/shotwell-publishing/shotwell-publishing.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo `test -f 'plugins/shotwell-publishing/shotwell-publishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/shotwell-publishing.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Plo @@ -2936,34 +2868,6 @@ plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-s @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo `test -f 'plugins/shotwell-publishing/shotwell-publishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/shotwell-publishing.c -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo: plugins/shotwell-publishing/FacebookPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo `test -f 'plugins/shotwell-publishing/FacebookPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FacebookPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/FacebookPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo `test -f 'plugins/shotwell-publishing/FacebookPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FacebookPublishing.c - -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo: plugins/shotwell-publishing/PicasaPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo `test -f 'plugins/shotwell-publishing/PicasaPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PicasaPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/PicasaPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo `test -f 'plugins/shotwell-publishing/PicasaPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PicasaPublishing.c - -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo: plugins/shotwell-publishing/FlickrPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo `test -f 'plugins/shotwell-publishing/FlickrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FlickrPublishing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/FlickrPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo `test -f 'plugins/shotwell-publishing/FlickrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FlickrPublishing.c - -plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo: plugins/shotwell-publishing/YouTubePublishing.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo `test -f 'plugins/shotwell-publishing/YouTubePublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/YouTubePublishing.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/YouTubePublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo `test -f 'plugins/shotwell-publishing/YouTubePublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/YouTubePublishing.c - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo: plugins/shotwell-publishing/PiwigoPublishing.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo `test -f 'plugins/shotwell-publishing/PiwigoPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PiwigoPublishing.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Plo @@ -6770,20 +6674,6 @@ $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(src @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ - fi -$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)mv -f $@-t $@ $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c: $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; fi @if test -f $@; then :; else \ @@ -6863,34 +6753,14 @@ $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_s @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ fi -$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi -$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ fi -$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi +$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi + $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi $(AM_V_at)mv -f $@-t $@ $(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi @@ -7414,14 +7284,8 @@ maintainer-clean-generic: -rm -f $(srcdir)/plugins/shotwell-data-imports/shotwell-data-imports.c -rm -f $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c -rm -f $(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c -rm -f $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c - -rm -f $(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c -rm -f $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c -rm -f $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c -rm -f $(srcdir)/plugins/shotwell-transitions/BlindsEffect.c -rm -f $(srcdir)/plugins/shotwell-transitions/ChessEffect.c @@ -7656,14 +7520,8 @@ maintainer-clean-generic: -rm -f plugins/shotwell-data-imports/shotwell-data-imports.c -rm -f plugins/shotwell-publishing-extras/GalleryConnector.c -rm -f plugins/shotwell-publishing-extras/RajcePublishing.c - -rm -f plugins/shotwell-publishing-extras/TumblrPublishing.c - -rm -f plugins/shotwell-publishing-extras/YandexPublishing.c -rm -f plugins/shotwell-publishing-extras/shotwell-publishing-extras.c - -rm -f plugins/shotwell-publishing/FacebookPublishing.c - -rm -f plugins/shotwell-publishing/FlickrPublishing.c - -rm -f plugins/shotwell-publishing/PicasaPublishing.c -rm -f plugins/shotwell-publishing/PiwigoPublishing.c - -rm -f plugins/shotwell-publishing/YouTubePublishing.c -rm -f plugins/shotwell-publishing/shotwell-publishing.c -rm -f plugins/shotwell-transitions/BlindsEffect.c -rm -f plugins/shotwell-transitions/ChessEffect.c diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml index fb3b733..1ed0718 100644 --- a/misc/org.yorba.shotwell.gschema.xml +++ b/misc/org.yorba.shotwell.gschema.xml @@ -321,107 +321,7 @@ A numeric code representing the last service to which photos were published - - - - - - - - - "" - access token - Facebook OAuth token for the currently logged in session, if any - - - - "" - user i.d. - Facebook user i.d. for the currently logged in user, if any - - - - "" - user name - The name of the currently logged in Facebook user, if any - - - - 0 - default size code - A numeric code representing the default size for photos published to Facebook - - - - false - remove sensitive info from uploads - Whether images being uploaded to Facebook should have their metadata removed first - - - - - - "" - OAuth Access Phase Token - The authorization token for the currently logged in Flickr user, if any - - - - "" - OAuth Access Phase Token Secret - The cryptographic secret used to sign requests against the authorization token for the currently logged in Flickr user, if any - - - - "" - username - The user name of the currently logged in Flickr user, if any - - - - 2 - default size code - A numeric code representing the default size for photos published to Flickr - - - - 1 - default visibility - A numeric code representing the default visibility for photos published to Flickr - - - - false - remove sensitive info from uploads - Whether images being uploaded to Flickr should have their metadata removed first - - - - - - "" - refresh token - The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any. - - - - 2 - default size - A numeric code representing the default size for photos uploaded to Picasa Web Albums - - - - "" - last album - The name of the last album the user published photos to, if any - - - - false - remove sensitive info from uploads - Whether images being uploaded to Picasa should have their metadata removed first - @@ -530,14 +430,6 @@ - - - "" - refresh token - The OAuth token used to refresh the YouTube session for the currently logged in user, if any. - - - "" @@ -621,48 +513,12 @@ - - true - enable facebook publishing plugin - True if the Facebook publishing plugin is enabled, false otherwise - - - - true - enable flickr publishing plugin - True if the Flickr publishing plugin is enabled, false otherwise - - - - true - enable picasa publishing plugin - True if the Picasa Web Albums publishing plugin is enabled, false otherwise - - - - true - enable youtube publishing plugin - True if the YouTube publishing plugin is enabled, false otherwise - - true enable piwigo publishing plugin True if the Piwigo publishing plugin is enabled, false otherwise - - false - enable yandex publishing plugin - True if the Yandex.Fotki publishing plugin is enabled, false otherwise - - - - false - enable tumblr publishing plugin - True if the Tumblr publishing plugin is enabled, false otherwise - - false enable rajce publishing plugin diff --git a/misc/shotwell.appdata.xml.in b/misc/shotwell.appdata.xml.in index 955ec1c..4371892 100644 --- a/misc/shotwell.appdata.xml.in +++ b/misc/shotwell.appdata.xml.in @@ -16,10 +16,6 @@ your master photos, making it easy to experiment and correct errors.

- When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, - Picasa (Google Plus), and more. -

-

Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats.

diff --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in.in index aa1ede2..ea52381 100644 --- a/misc/shotwell.desktop.in.in +++ b/misc/shotwell.desktop.in.in @@ -4,7 +4,7 @@ Name=Shotwell GenericName=Photo Manager Comment=Organize your photos # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo; +Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;piwigo; Exec=shotwell %U # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=shotwell diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala index bbd5ddb..342f2f3 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.vala +++ b/plugins/shotwell-publishing/shotwell-publishing.vala @@ -6,7 +6,7 @@ extern const string _VERSION; -// "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube +// "core services" is: Piwigo private class ShotwellPublishingCoreServices : Object, Spit.Module { private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; @@ -15,10 +15,6 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module { public ShotwellPublishingCoreServices(GLib.File module_file) { GLib.File resource_directory = module_file.get_parent(); - pluggables += new FacebookService(resource_directory); - pluggables += new PicasaService(resource_directory); - pluggables += new FlickrService(resource_directory); - pluggables += new YouTubeService(resource_directory); pluggables += new PiwigoService(resource_directory); } diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala index 9e70d30..560d193 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala @@ -10,8 +10,6 @@ private class ShotwellPublishingExtraServices : Object, Spit.Module { private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; public ShotwellPublishingExtraServices(GLib.File module_file) { - pluggables += new YandexService(); - pluggables += new TumblrService(module_file.get_parent()); pluggables += new RajceService(module_file.get_parent()); pluggables += new Gallery3Service(module_file.get_parent()); } diff --git a/po/POTFILES.in b/po/POTFILES.in index 5f96f0a..637971d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,24 +28,10 @@ plugins/shotwell-publishing-extras/rajce_authentication_pane.ui plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala -plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui -plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui -plugins/shotwell-publishing-extras/TumblrPublishing.vala -plugins/shotwell-publishing-extras/YandexPublishing.vala -plugins/shotwell-publishing-extras/yandex_publish_model.ui -plugins/shotwell-publishing/facebook_publishing_options_pane.ui -plugins/shotwell-publishing/FacebookPublishing.vala -plugins/shotwell-publishing/flickr_pin_entry_pane.ui -plugins/shotwell-publishing/flickr_publishing_options_pane.ui -plugins/shotwell-publishing/FlickrPublishing.vala -plugins/shotwell-publishing/picasa_publishing_options_pane.ui -plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/piwigo_authentication_pane.ui plugins/shotwell-publishing/piwigo_publishing_options_pane.ui plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-publishing/shotwell-publishing.vala -plugins/shotwell-publishing/youtube_publishing_options_pane.ui -plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala @@ -215,7 +201,6 @@ src/ThumbnailCache.vala src/Thumbnail.vala src/TimedQueue.vala src/Tombstone.vala -src/unit/rc/template.vala src/unit/Unit.vala src/UnityProgressBar.vala src/Upgrades.vala diff --git a/publish-extra.am b/publish-extra.am index 6c713bf..7c0026e 100644 --- a/publish-extra.am +++ b/publish-extra.am @@ -6,17 +6,12 @@ dist_plugin_DATA += \ plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui \ plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \ plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \ - plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \ - plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \ - plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \ - plugins/shotwell-publishing-extras/yandex_publish_model.ui + plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \ plugins/shotwell-publishing-extras/GalleryConnector.vala \ plugins/shotwell-publishing-extras/RajcePublishing.vala \ plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \ - plugins/shotwell-publishing-extras/TumblrPublishing.vala \ - plugins/shotwell-publishing-extras/YandexPublishing.vala \ plugins/shotwell-plugin-common.vapi plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \ diff --git a/publish.am b/publish.am index 93ec0cb..8e7d9ae 100644 --- a/publish.am +++ b/publish.am @@ -1,25 +1,12 @@ plugin_LTLIBRARIES += plugins/shotwell-publishing/shotwell-publishing.la dist_plugin_DATA += \ - plugins/shotwell-publishing/facebook.png \ - plugins/shotwell-publishing/flickr.png \ - plugins/shotwell-publishing/picasa.png \ plugins/shotwell-publishing/piwigo.png \ - plugins/shotwell-publishing/youtube.png \ - plugins/shotwell-publishing/facebook_publishing_options_pane.ui \ - plugins/shotwell-publishing/flickr_pin_entry_pane.ui \ - plugins/shotwell-publishing/flickr_publishing_options_pane.ui \ - plugins/shotwell-publishing/picasa_publishing_options_pane.ui \ plugins/shotwell-publishing/piwigo_authentication_pane.ui \ - plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \ - plugins/shotwell-publishing/youtube_publishing_options_pane.ui + plugins/shotwell-publishing/piwigo_publishing_options_pane.ui plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \ plugins/shotwell-publishing/shotwell-publishing.vala \ - plugins/shotwell-publishing/FacebookPublishing.vala \ - plugins/shotwell-publishing/PicasaPublishing.vala \ - plugins/shotwell-publishing/FlickrPublishing.vala \ - plugins/shotwell-publishing/YouTubePublishing.vala \ plugins/shotwell-publishing/PiwigoPublishing.vala \ plugins/shotwell-plugin-common.vapi diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala index 2bbb8d8..c9556aa 100644 --- a/src/plugins/PublishingInterfaces.vala +++ b/src/plugins/PublishingInterfaces.vala @@ -8,8 +8,7 @@ * Shotwell Pluggable Publishing API * * The Shotwell Pluggable Publishing API allows you to write plugins that upload - * photos and videos to web services. The Shotwell distribution includes publishing - * support for four core services: Facebook, Flickr, Picasa Web Albums, and YouTube. + * photos and videos to web services. * To enable Shotwell to connect to additional services, developers like you write * publishing plugins, dynamically-loadable shared objects that are linked into the * Shotwell process at runtime. Publishing plugins are just one of several kinds of diff --git a/src/plugins/StandardHostInterface.vala b/src/plugins/StandardHostInterface.vala index 857c8ff..7c67e55 100644 --- a/src/plugins/StandardHostInterface.vala +++ b/src/plugins/StandardHostInterface.vala @@ -22,24 +22,8 @@ public class StandardHostInterface : Object, Spit.HostInterface { private static string parse_key(string id) { // special case: legacy plugins (Web publishers moved into SPIT) have special names // new plugins will use their full ID - switch (id) { - case "org.yorba.shotwell.publishing.facebook": - return "facebook"; - - case "org.yorba.shotwell.publishing.picasa": - return "picasa"; - - case "org.yorba.shotwell.publishing.flickr": - return "flickr"; - - case "org.yorba.shotwell.publishing.youtube": - return "youtube"; - - default: - return id; - } + return id; } - public File get_module_file() { return module_file; }