Commit Graph

91 Commits

Author SHA1 Message Date
Hans Ulrich Niedermann
7205701c7d POTFILES.in: Add remaining source files using i18n.h
Add remaining source files including libgphoto2/i18n.h
or libgphoto2_port/i18n.h to the respective POTFILES.in,
regardless of whether or not the source file actually
contains translated strings.
2021-10-25 06:51:34 +02:00
Hans Ulrich Niedermann
0b2b6207c2 Factor out i18n stuff into separate i18n.h files
Factor out the i18n definitions into i18n.h include files:
One include file each for libgphoto2 and for libgphoto2_port.

This removes the complete

    #ifdef ENABLE_NLS
    #  include <libintl.h>
    #  undef _
    #  define _(String) dgettext (GETTEXT_PACKAGE, String)
    #  ifdef gettext_noop
    #    define N_(String) gettext_noop (String)
    #  else
    #    define N_(String) (String)
    #  endif
    #else
    #  define _(String) (String)
    #  define N_(String) (String)
    #endif

block (which in some occasions defines even more macros)
and replaces it with a single line

    #include "libgphoto2/i18n.h"

for camlibs and libgphoto2 itself and with

    #include "libgphoto2_port/i18n.h"

for iolibs and libgphoto2_port itself.

This gives us two central locations to change the defintions.
2021-10-25 00:20:21 +02:00
Siim Meerits
456a1d598b Remove trailing whitespace from all *.h and *.c files. 2020-07-27 17:37:00 +03:00
Yuri Chornoivan
d385c32653 Fix minor typos 2020-05-25 12:32:37 +03:00
Hans Ulrich Niedermann
e14e615471 camlib template Makefile-files: group files logically 2020-01-22 10:13:07 +01:00
Hans Ulrich Niedermann
0c72a5fdc2 Help editors treat as Makefiles all our Makefile-files files 2016-10-28 19:17:51 +02:00
Marcus Meissner
30b46ccc95 removed copyright umlauts and replaced other umlauts
by international spelling


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15027 67ed7778-7388-44ab-90cf-0a291f65f57c
2014-06-27 05:39:29 +00:00
Marcus Meissner
f897031217 updated fsf address
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14608 67ed7778-7388-44ab-90cf-0a291f65f57c
2014-01-01 20:27:33 +00:00
Marcus Meissner
bb3d18289e Batch commit from weekend work:
- removed "type" from CameraFile handling:
  - all put_file functions and hooks get "type" as argument now
  - added type to the set_file_info_noop call
- started removal of "name" from CameraFile
  - generate new filename from original filename + camerafile type + mimetype
- new gp_camera_autodetect() helper function

- adapted all drivers.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11818 67ed7778-7388-44ab-90cf-0a291f65f57c
2009-02-16 08:09:49 +00:00
Marcus Meissner
a3ee73043c * removed CameraFileInfoFile.name, adjusted users
and callers.
* added filename argument to put_file_func, 
  set_info_noop and set_file_noop functions.
adjusted all camlibs


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11773 67ed7778-7388-44ab-90cf-0a291f65f57c
2009-01-25 20:30:53 +00:00
Marcus Meissner
e236b1b0c2 added ChangeLog and other not yet distributed files
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11448 67ed7778-7388-44ab-90cf-0a291f65f57c
2008-10-19 11:51:49 +00:00
Marcus Meissner
254e1d3d48 more gone .cvsignore files
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11350 67ed7778-7388-44ab-90cf-0a291f65f57c
2008-09-26 05:56:35 +00:00
Marcus Meissner
6b8adf322c removed the warnings
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10913 67ed7778-7388-44ab-90cf-0a291f65f57c
2007-12-30 20:29:29 +00:00
Hans Ulrich Niedermann
55ff53175a comment tuning
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10640 67ed7778-7388-44ab-90cf-0a291f65f57c
2007-09-04 20:45:12 +00:00
Marcus Meissner
aeb363f49a comment _() and N_()
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10350 67ed7778-7388-44ab-90cf-0a291f65f57c
2007-06-03 06:25:30 +00:00
Marcus Meissner
74684b1cd9 changed functions to be non-static again to generate the documentation.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10340 67ed7778-7388-44ab-90cf-0a291f65f57c
2007-05-31 20:47:38 +00:00
Marcus Meissner
cff44360af added storage_info_func sample
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9838 67ed7778-7388-44ab-90cf-0a291f65f57c
2007-01-02 21:58:59 +00:00
Hans Ulrich Niedermann
09d748c721 disable specific gcc warnings in template camlib
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9746 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-12-28 08:52:26 +00:00
Hans Ulrich Niedermann
ab3a2315b1 initialize Camera *camera in put_file_func()
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9743 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-12-27 10:26:33 +00:00
Hans Ulrich Niedermann
d9e41c4de0 2.3.1.0.trunk, non-recursive camlibs build
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9736 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-12-26 22:30:11 +00:00
Hans Ulrich Niedermann
be5731e6f0 camlib README files: rename, ship in dist tarball, install as doc
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9296 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-10-07 13:52:32 +00:00
Hans Ulrich Niedermann
c96bda51dd Consistently use #include <gphoto2/gphoto2-foo.h> everywhere.
This moves the header files to a new subdirectory gphoto2 in both
  libgphoto2 and libphoto2_port/libgphoto2. All references are
  adapted appropriately.



git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9221 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-09-28 03:04:21 +00:00
Marcus Meissner
e0db5d34df updated some documentation.
added statics to functions.
use gp_fs_set_funcs() and static fsfuncs.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8632 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-03-19 20:32:02 +00:00
Marcus Meissner
e48c203f33 ignore more
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8470 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-01-12 09:58:49 +00:00
Hans Ulrich Niedermann
7b2e4c9e71 add *.sym file to _DEPENDENCIES
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8401 67ed7778-7388-44ab-90cf-0a291f65f57c
2006-01-03 13:03:47 +00:00
Hubert Figuiere
d832129bbc * template.c: cleanup and some warning fixed.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8339 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-12-26 03:49:37 +00:00
Hans Ulrich Niedermann
4cc3bd442d ship and compile template camlib, but do not install it
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8332 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-12-25 17:54:22 +00:00
Hans Ulrich Niedermann
ba6e156df7 added/tuned/updated doxygen docs (made code compile again)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8101 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-06-15 19:17:39 +00:00
Hans Ulrich Niedermann
19eb306043 cosmetics
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8096 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-06-14 00:57:43 +00:00
Hans Ulrich Niedermann
31cdca11d8 template camlib: add doxygen documentation.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8095 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-06-14 00:54:23 +00:00
Hans Ulrich Niedermann
937c1d705c build camlibs as libtool modules with simple names and symbol list
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8065 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-06-11 17:09:47 +00:00
Hans Ulrich Niedermann
39ed60337f remove redundant INCLUDE = definitions from Makefile.am
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7830 67ed7778-7388-44ab-90cf-0a291f65f57c
2005-04-14 18:32:57 +00:00
Michael Rensing
d6491f4160 small change to template to reflect the new Manufacturer:Model notation
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6054 67ed7778-7388-44ab-90cf-0a291f65f57c
2003-01-10 22:10:53 +00:00
Arnaud Launay
b9d58ca88b replace (c) and (C) by �
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5969 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-12-15 11:45:10 +00:00
Arnaud Launay
64e420e288 <config.h> -> "config.h"
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5859 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-11-29 16:09:58 +00:00
Hans Ulrich Niedermann
917ba5e7c3 gettext stuff for Arnaud
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5776 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-11-23 00:47:57 +00:00
Hans Ulrich Niedermann
be9b07f8bf moved definition of camlibdir to configure.in
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5547 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-11-06 14:31:44 +00:00
Lutz Mueller
965ed1af1b *** empty log message ***
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5352 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-10-03 20:45:00 +00:00
Arnaud Launay
317c63b327 - modify config.h location
- add intl dir in include dirs


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5277 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-09-14 19:42:54 +00:00
Marcus Meissner
140ea131d9 * **/Makefile.am: Do not use $(prefix)/lib/, but $(libdir).
On some architecturs $(libdir) might not be /lib/, but /lib64/
	  (on s390x for instance).


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4010 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-01-25 14:13:03 +00:00
Marcus Meissner
efbc719fd4 * Added missing GPContext* arguments.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3844 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-01-13 10:19:19 +00:00
Lutz Mueller
0dedb0e163 2002-01-10 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/gphoto2-filesys.[c,h]: Add a GPContext to all functions
          that potentially access the camera. This makes cancelling of
          all operations possible and improves error reporting.
        * tests/test-filesys.c:
        * libgphoto2/gphoto2-camera.c:
        * camlibs: Adjust to reflect above changes


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3798 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-01-10 23:06:56 +00:00
Lutz Mueller
908429e2df 2002-01-02 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/Makefile.am
        * camlibs/ * /Makefile.am: Install drivers into versioned
          subdirectories.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3648 67ed7778-7388-44ab-90cf-0a291f65f57c
2002-01-02 12:34:05 +00:00
Johannes Erdfelt
3b234b95cc Zero out the CameraAbilities struct so we don't have garbage in fields
This should help fix some of the problems with the new USB class matching
code people have reported


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3628 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-12-30 18:19:10 +00:00
Lutz Mueller
0947dcd160 2001-12-07 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* configure.in: Remove dotlib hack
        * camlibs: Do it "the right way"


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3422 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-12-07 00:21:17 +00:00
Lutz Mueller
c11497ad5c 2001-12-05 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
$builddir != $srcdir fixes.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3402 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-12-05 21:37:57 +00:00
Lutz Mueller
b219dc05d4 2001-11-26 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs/directory/directory.c (set_info_func): Rewrite
        * camlibs/ptp/library.c:
        * camlibs/fuji/fuji.c: Don't advertise what you don't support.
        * camlibs/konica/library.c (set_info_func): Rewrite
        * libgphoto2: Make *set_info consistent


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3224 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-26 14:00:37 +00:00
Marcus Meissner
1d99ea4f37 * camlibs/template/template.c: Make it compile with current libraries.
Added NLS macros, missing functions, etc.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2893 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-03 14:35:22 +00:00
Marcus Meissner
cee9badffc gp_widget_new template changed
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2891 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-03 14:00:19 +00:00
Dan Fandrich
b49de71c57 Added -module flag to libtool link command for each library that is dlopen'ed
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2876 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-10-31 19:27:55 +00:00