summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlessio Treglia <alessio@debian.org>2012-06-03 00:47:50 +0200
committerAlessio Treglia <alessio@debian.org>2012-06-03 00:47:50 +0200
commit2fc0bb47c780bf8dc80944b4fc3efac26d20a134 (patch)
tree3cb02a9f74115673b5b64578cab09a6e33270d4b /src
parenta9bb26f88284042eb37fddb631a7a1d57960653e (diff)
parentf61940ebd00dbbcfccf408fd93fb1ab2ec5c78d5 (diff)
Merge tag 'upstream/3.4.2'
Upstream version 3.4.2
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in33
-rw-r--r--src/ui.c4
-rw-r--r--src/ui.vala8
3 files changed, 35 insertions, 10 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index de411ce..4e60a15 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -87,6 +104,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(simple_scan_SOURCES)
DIST_SOURCES = $(simple_scan_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -289,8 +311,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p; \
@@ -488,9 +513,9 @@ $(srcdir)/ui.c: $(srcdir)/simple_scan_vala.stamp
@if test -f $@; then :; else \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/simple_scan_vala.stamp; \
fi
-$(srcdir)/simple_scan_vala.stamp: $(simple_scan_SOURCES)
+$(srcdir)/simple_scan_vala.stamp: config.vapi book.vala book-view.vala colord.vapi jpeglib.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala
$(AM_V_at)rm -f $@ && echo stamp > $@-t
- $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C $(simple_scan_SOURCES)
+ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(simple_scan_VALAFLAGS) $(VALAFLAGS) -C config.vapi book.vala book-view.vala colord.vapi jpeglib.vapi page.vala page-view.vala sane.vapi simple-scan.vala scanner.vala ui.vala
$(AM_V_at)mv -f $@-t $@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff --git a/src/ui.c b/src/ui.c
index fd42d4e..5b27835 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1342,7 +1342,7 @@ static gchar* simple_scan_choose_file_location (SimpleScan* self) {
filter = _tmp19_;
_tmp20_ = filter;
_tmp21_ = _ ("Image Files");
- gtk_buildable_set_name ((GtkBuildable*) _tmp20_, _tmp21_);
+ gtk_file_filter_set_name (_tmp20_, _tmp21_);
_tmp22_ = filter;
gtk_file_filter_add_pixbuf_formats (_tmp22_);
_tmp23_ = filter;
@@ -1356,7 +1356,7 @@ static gchar* simple_scan_choose_file_location (SimpleScan* self) {
filter = _tmp27_;
_tmp28_ = filter;
_tmp29_ = _ ("All Files");
- gtk_buildable_set_name ((GtkBuildable*) _tmp28_, _tmp29_);
+ gtk_file_filter_set_name (_tmp28_, _tmp29_);
_tmp30_ = filter;
gtk_file_filter_add_pattern (_tmp30_, "*");
_tmp31_ = self->priv->save_dialog;
diff --git a/src/ui.vala b/src/ui.vala
index 3056061..db19d77 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -351,14 +351,14 @@ public class SimpleScan
/* Filter to only show images by default */
var filter = new Gtk.FileFilter ();
- filter.set_name (/* Save dialog: Filter name to show only image files */
- _("Image Files"));
+ filter.set_filter_name (/* Save dialog: Filter name to show only image files */
+ _("Image Files"));
filter.add_pixbuf_formats ();
filter.add_mime_type ("application/pdf");
save_dialog.add_filter (filter);
filter = new Gtk.FileFilter ();
- filter.set_name (/* Save dialog: Filter name to show all files */
- _("All Files"));
+ filter.set_filter_name (/* Save dialog: Filter name to show all files */
+ _("All Files"));
filter.add_pattern ("*");
save_dialog.add_filter (filter);