Mercurial > hg > forks > geeqie

changeset 2551:17a0678aa759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge remote-tracking branch 'upstream/master' into view_file_po
author Omari Stephens <xsdg@google.com>
date Mon, 10 Jul 2017 07:44:34 +0000
parents 6e9aad93a5c0 (diff) 73e74df0f3a3 (current diff)
children 50591e6aec98
files
diffstat 2 files changed, 5 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/po/POTFILES.in	Mon Jul 10 07:41:49 2017 +0000
+++ b/po/POTFILES.in	Mon Jul 10 07:44:34 2017 +0000
@@ -72,6 +72,8 @@
 src/pan-view/pan-timeline.c
 src/pan-view/pan-util.c
 src/pan-view/pan-view.c
+src/pan-view/pan-view-filter.c
+src/pan-view/pan-view-search.c
 src/pixbuf-renderer.c
 src/pixbuf_util.c
 src/preferences.c
@@ -82,6 +84,7 @@
 src/renderer-tiles.c
 src/search.c
 src/secure_save.c
+src/shortcuts.c
 src/similar.c
 src/slideshow.c
 src/thumb.c
@@ -103,6 +106,6 @@
 src/view_dir_list.c
 src/view_dir_tree.c
 src/view_file.c
-src/view_file_icon.c
-src/view_file_list.c
+src/view_file/view_file_icon.c
+src/view_file/view_file_list.c
 src/window.c
--- a/src/view_file/view_file_common.c	Mon Jul 10 07:41:49 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- *  This file is a part of Geeqie project (http://www.geeqie.org/).
- *  Copyright (C) 2008 - 2016 The Geeqie Team
- *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation; either version 2 of the License, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- *  more details.
- */
-
-guint vfcommon_count(ViewFile *vf, gint64 *bytes)
-{
-	if (bytes)
-		{
-		gint64 b = 0;
-		GList *work;
-
-		work = vf->list;
-		while (work)
-			{
-			FileData *fd = work->data;
-			work = work->next;
-
-			b += fd->size;
-			}
-
-		*bytes = b;
-		}
-
-	return g_list_length(vf->list);
-}
-