[gthumb: 52/57] Merge branch 'webalbums'



commit 667bfb2bee877041e688152484688ca2c7303e83
Merge: 42488bb 5964cc4
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Jun 20 11:02:25 2010 +0200

    Merge branch 'webalbums'

 configure.ac                                       |   30 +
 extensions/Makefile.am                             |    1 +
 extensions/burn_disc/gth-burn-task.c               |    8 +-
 extensions/catalogs/gth-organize-task.c            |    2 +-
 extensions/comments/main.c                         |   12 +-
 extensions/exiv2_tools/exiv2-utils.cpp             |    6 +-
 extensions/facebook/dlg-export-to-facebook.c       |   12 +-
 extensions/facebook/facebook-authentication.c      |   16 +-
 extensions/file_manager/gth-copy-task.c            |    7 +-
 extensions/file_manager/gth-duplicate-task.c       |    7 +-
 extensions/flicker/dlg-export-to-flickr.c          |   10 +-
 extensions/flicker/dlg-import-from-flickr.c        |   11 +-
 extensions/flicker/flickr-authentication.c         |   16 +-
 extensions/image_rotation/gth-transform-task.c     |    4 +-
 extensions/oauth/oauth-authentication.c            |   19 +-
 extensions/photobucket/dlg-export-to-photobucket.c |   12 +-
 extensions/picasaweb/dlg-export-to-picasaweb.c     |   30 +-
 extensions/picasaweb/dlg-import-from-picasaweb.c   |   20 +-
 extensions/rename_series/dlg-rename-series.c       |    3 -
 extensions/rename_series/gth-rename-task.c         |   11 +-
 extensions/webalbums/Makefile.am                   |   59 +
 extensions/webalbums/actions.c                     |   49 +
 extensions/webalbums/actions.h                     |   32 +
 extensions/webalbums/albumtheme-private.c          |  960 ++++++
 extensions/webalbums/albumtheme-private.h          |  267 ++
 extensions/webalbums/albumtheme.l                  |  208 ++
 extensions/webalbums/albumtheme.y                  |  465 +++
 extensions/webalbums/callbacks.c                   |  118 +
 extensions/webalbums/callbacks.h                   |   31 +
 extensions/webalbums/data/Makefile.am              |   18 +
 extensions/webalbums/data/albumthemes/.cvsignore   |    2 +
 .../webalbums/data/albumthemes/Classic/.cvsignore  |    2 +
 .../webalbums/data/albumthemes/Classic/Makefile.am |   23 +
 .../webalbums/data/albumthemes/Classic/back.png    |  Bin 0 -> 448 bytes
 .../webalbums/data/albumthemes/Classic/bot.png     |  Bin 0 -> 331 bytes
 .../data/albumthemes/Classic/image.gthtml          |   98 +
 .../data/albumthemes/Classic/index.gthtml          |   66 +
 .../webalbums/data/albumthemes/Classic/layout.css  |  257 ++
 .../webalbums/data/albumthemes/Classic/left.png    |  Bin 0 -> 119 bytes
 .../webalbums/data/albumthemes/Classic/next.png    |  Bin 0 -> 1040 bytes
 .../webalbums/data/albumthemes/Classic/prev.png    |  Bin 0 -> 1063 bytes
 .../webalbums/data/albumthemes/Classic/preview.png |  Bin 0 -> 19528 bytes
 .../webalbums/data/albumthemes/Classic/right.png   |  Bin 0 -> 182 bytes
 .../webalbums/data/albumthemes/Classic/style.css   |   95 +
 .../data/albumthemes/Classic/thumbnail.gthtml      |   33 +
 .../webalbums/data/albumthemes/Classic/top.png     |  Bin 0 -> 202 bytes
 .../data/albumthemes/ClassicClips/.cvsignore       |    2 +
 .../data/albumthemes/ClassicClips/Makefile.am      |   24 +
 .../data/albumthemes/ClassicClips/back.png         |  Bin 0 -> 774 bytes
 .../data/albumthemes/ClassicClips/bot.png          |  Bin 0 -> 738 bytes
 .../data/albumthemes/ClassicClips/image.gthtml     |   98 +
 .../data/albumthemes/ClassicClips/index.gthtml     |   66 +
 .../data/albumthemes/ClassicClips/layout.css       |  257 ++
 .../data/albumthemes/ClassicClips/left.png         |  Bin 0 -> 452 bytes
 .../data/albumthemes/ClassicClips/next.png         |  Bin 0 -> 1174 bytes
 .../data/albumthemes/ClassicClips/prev.png         |  Bin 0 -> 1200 bytes
 .../data/albumthemes/ClassicClips/preview.png      |  Bin 0 -> 22450 bytes
 .../data/albumthemes/ClassicClips/right.png        |  Bin 0 -> 493 bytes
 .../data/albumthemes/ClassicClips/style.css        |   95 +
 .../data/albumthemes/ClassicClips/thumbnail.gthtml |   33 +
 .../data/albumthemes/ClassicClips/top.png          |  Bin 0 -> 653 bytes
 extensions/webalbums/data/albumthemes/Makefile.am  |    4 +
 .../data/albumthemes/NeatRound/.cvsignore          |    2 +
 .../data/albumthemes/NeatRound/Makefile.am         |   24 +
 .../webalbums/data/albumthemes/NeatRound/back.png  |  Bin 0 -> 860 bytes
 .../webalbums/data/albumthemes/NeatRound/bot.png   |  Bin 0 -> 812 bytes
 .../data/albumthemes/NeatRound/image.gthtml        |   98 +
 .../data/albumthemes/NeatRound/index.gthtml        |   66 +
 .../data/albumthemes/NeatRound/layout.css          |  258 ++
 .../webalbums/data/albumthemes/NeatRound/left.png  |  Bin 0 -> 220 bytes
 .../webalbums/data/albumthemes/NeatRound/next.png  |  Bin 0 -> 1417 bytes
 .../webalbums/data/albumthemes/NeatRound/prev.png  |  Bin 0 -> 1443 bytes
 .../data/albumthemes/NeatRound/preview.png         |  Bin 0 -> 19734 bytes
 .../webalbums/data/albumthemes/NeatRound/right.png |  Bin 0 -> 278 bytes
 .../webalbums/data/albumthemes/NeatRound/style.css |   95 +
 .../data/albumthemes/NeatRound/thumbnail.gthtml    |   33 +
 .../webalbums/data/albumthemes/NeatRound/top.png   |  Bin 0 -> 538 bytes
 .../webalbums/data/albumthemes/Wiki/.cvsignore     |    2 +
 .../webalbums/data/albumthemes/Wiki/Makefile.am    |   12 +
 .../webalbums/data/albumthemes/Wiki/image.gthtml   |  103 +
 .../webalbums/data/albumthemes/Wiki/index.gthtml   |   85 +
 .../webalbums/data/albumthemes/Wiki/preview.png    |  Bin 0 -> 18919 bytes
 .../webalbums/data/albumthemes/Wiki/style.css      |  298 ++
 .../data/albumthemes/Wiki/thumbnail.gthtml         |   23 +
 extensions/webalbums/data/albumthemes/text.h       |   32 +
 .../webalbums/data/gthumb_webalbums.schemas.in     |  382 +++
 extensions/webalbums/data/ui/Makefile.am           |    5 +
 extensions/webalbums/data/ui/web-album-exporter.ui | 1201 +++++++
 extensions/webalbums/dlg-web-exporter.c            |  534 +++
 extensions/webalbums/dlg-web-exporter.h            |   31 +
 extensions/webalbums/gth-web-exporter.c            | 3412 ++++++++++++++++++++
 extensions/webalbums/gth-web-exporter.h            |  102 +
 extensions/webalbums/main.c                        |   54 +
 extensions/webalbums/preferences.h                 |   62 +
 extensions/webalbums/webalbums.extension.in.in     |   11 +
 gthumb/dom.c                                       |  418 ++--
 gthumb/gedit-message-area.c                        |   25 +-
 gthumb/gio-utils.c                                 |   57 +-
 gthumb/gio-utils.h                                 |    1 +
 gthumb/glib-utils.c                                |  230 ++
 gthumb/glib-utils.h                                |   10 +
 gthumb/gth-browser.c                               |   41 +-
 gthumb/gth-file-properties.c                       |    3 -
 gthumb/gth-icon-cache.c                            |   12 +-
 gthumb/gth-image-viewer.c                          |    1 -
 gthumb/gth-main.c                                  |    6 +-
 gthumb/gth-marshal.list                            |    1 +
 gthumb/gth-metadata-provider.h                     |   61 +-
 gthumb/gth-metadata.c                              |    7 +
 gthumb/gth-metadata.h                              |    1 +
 gthumb/gth-overwrite-dialog.c                      |  117 +-
 gthumb/gth-overwrite-dialog.h                      |    3 +-
 gthumb/gth-pixbuf-list-task.c                      |   26 +-
 gthumb/gth-progress-dialog.c                       |    9 +-
 gthumb/gth-task.c                                  |   14 +-
 gthumb/gth-task.h                                  |    9 +-
 gthumb/gtk-utils.c                                 |    2 +
 gthumb/typedefs.h                                  |    3 +-
 po/POTFILES.in                                     |   16 +
 119 files changed, 11151 insertions(+), 446 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]