[gthumb] meson: rebase fixes

[Paolo Bacchilega <paobac src gnome org>]

commit 43141d9e1e5b7e15027414089e8b757586c7a8aa
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Oct 28 15:02:26 2017 +0200

    meson: rebase fixes

 extensions/facebook/meson.build            |    1 -
 extensions/meson.build                     |    1 -
 extensions/photobucket/data/meson.build    |    1 -
 extensions/photobucket/data/ui/meson.build |    5 ---
 extensions/photobucket/meson.build         |   52 ----------------------------
 po/POTFILES.in                             |   38 --------------------
 6 files changed, 0 insertions(+), 98 deletions(-)
---
diff --git a/extensions/facebook/meson.build b/extensions/facebook/meson.build
index 861c82c..823bd26 100644
--- a/extensions/facebook/meson.build
+++ b/extensions/facebook/meson.build
@@ -3,7 +3,6 @@ source_files = files(
   'actions.c',
   'callbacks.c',
   'dlg-export-to-facebook.c',
-  'dlg-import-from-facebook.c',
   'facebook-album.c',
   'facebook-album-properties-dialog.c',
   'facebook-photo.c',
diff --git a/extensions/meson.build b/extensions/meson.build
index 28cde03..f40fa4f 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
@@ -46,7 +46,6 @@ if with_webservices
   subdir('23hq')
   subdir('flicker')
 
-  subdir('photobucket')
   subdir('picasaweb')
 endif
 if with_webalbums
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f7f44e7..1cb27e1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -231,8 +231,6 @@ extensions/facebook/data/ui/facebook-album-properties.ui
 extensions/facebook/data/ui/import-from-facebook.ui
 extensions/facebook/dlg-export-to-facebook.c
 extensions/facebook/dlg-export-to-facebook.h
-extensions/facebook/dlg-import-from-facebook.c
-extensions/facebook/dlg-import-from-facebook.h
 extensions/facebook/facebook-album-properties-dialog.c
 extensions/facebook/facebook-album-properties-dialog.h
 extensions/facebook/facebook-album.c
@@ -523,19 +521,6 @@ extensions/photo_importer/actions.c
 extensions/photo_importer/actions.h
 extensions/photo_importer/callbacks.c
 extensions/photo_importer/callbacks.h
-<<<<<<< HEAD
-[type: gettext/glade]extensions/photo_importer/data/ui/import-menu.ui
-[type: gettext/glade]extensions/photo_importer/data/ui/photo-importer-options.ui
-[type: gettext/glade]extensions/photo_importer/data/ui/photo-importer.ui
-extensions/photo_importer/dlg-photo-importer.c
-extensions/photo_importer/dlg-photo-importer.h
-extensions/photo_importer/dlg-photo-importer-preferences.c
-extensions/photo_importer/dlg-photo-importer-preferences.h
-extensions/photo_importer/main.c
-[type: gettext/ini]extensions/photo_importer/photo_importer.extension.in.in
-extensions/photo_importer/photo-importer.h
-extensions/photo_importer/preferences.h
-=======
 extensions/photo_importer/data/ui/import-menu.ui
 extensions/photo_importer/data/ui/photo-importer-options.ui
 extensions/photo_importer/data/ui/photo-importer.ui
@@ -547,29 +532,6 @@ extensions/photo_importer/main.c
 extensions/photo_importer/photo-importer.h
 extensions/photo_importer/photo_importer.extension.in.in
 extensions/photo_importer/preferences.h
-extensions/photobucket/actions.c
-extensions/photobucket/actions.h
-extensions/photobucket/callbacks.c
-extensions/photobucket/callbacks.h
-extensions/photobucket/data/ui/export-to-photobucket.ui
-extensions/photobucket/data/ui/photobucket-album-properties.ui
-extensions/photobucket/dlg-export-to-photobucket.c
-extensions/photobucket/dlg-export-to-photobucket.h
-extensions/photobucket/main.c
-extensions/photobucket/photobucket-account.c
-extensions/photobucket/photobucket-account.h
-extensions/photobucket/photobucket-album-properties-dialog.c
-extensions/photobucket/photobucket-album-properties-dialog.h
-extensions/photobucket/photobucket-album.c
-extensions/photobucket/photobucket-album.h
-extensions/photobucket/photobucket-consumer.c
-extensions/photobucket/photobucket-consumer.h
-extensions/photobucket/photobucket-photo.c
-extensions/photobucket/photobucket-photo.h
-extensions/photobucket/photobucket-service.c
-extensions/photobucket/photobucket-service.h
-extensions/photobucket/photobucket.extension.in.in
->>>>>>> meson: converted build scripts to python3
 extensions/picasaweb/actions.c
 extensions/picasaweb/actions.h
 extensions/picasaweb/callbacks.c