Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
feh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
derf
feh
Commits
1d8d374f
Commit
1d8d374f
authored
13 years ago
by
Birte Kristina Friesel
Browse files
Options
Downloads
Patches
Plain Diff
Convert C++ style comments to /* */
parent
d87c8db1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/filelist.c
+1
-1
1 addition, 1 deletion
src/filelist.c
src/slideshow.c
+6
-5
6 additions, 5 deletions
src/slideshow.c
with
7 additions
and
6 deletions
src/filelist.c
+
1
−
1
View file @
1d8d374f
...
...
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include
"options.h"
gib_list
*
filelist
=
NULL
;
gib_list
*
original_file_items
=
NULL
;
/
/
original file items from argv
gib_list
*
original_file_items
=
NULL
;
/
*
original file items from argv
*/
int
filelist_len
=
0
;
gib_list
*
current_file
=
NULL
;
extern
int
errno
;
...
...
This diff is collapsed.
Click to expand it.
src/slideshow.c
+
6
−
5
View file @
1d8d374f
...
...
@@ -94,14 +94,14 @@ void cb_reload_timer(void *data)
winwidget
w
=
(
winwidget
)
data
;
/
/
save the current filename for refinding it in new list
/
*
save the current filename for refinding it in new list
*/
current_filename
=
estrdup
(
FEH_FILE
(
current_file
->
data
)
->
filename
);
gib_list_free_and_data
(
filelist
);
filelist
=
NULL
;
filelist_len
=
0
;
current_file
=
NULL
;
/
/
rebuild filelist from original_file_items
/
*
rebuild filelist from original_file_items
*/
if
(
gib_list_length
(
original_file_items
)
>
0
)
for
(
l
=
gib_list_last
(
original_file_items
);
l
;
l
=
l
->
prev
)
add_file_to_filelist_recursively
(
l
->
data
,
FILELIST_FIRST
);
...
...
@@ -113,7 +113,7 @@ void cb_reload_timer(void *data)
exit
(
1
);
}
/
/
find the previously current file
/
*
find the previously current file
*/
for
(
l
=
filelist
;
l
;
l
=
l
->
next
)
if
(
strcmp
(
FEH_FILE
(
l
->
data
)
->
filename
,
current_filename
)
==
0
)
{
current_file
=
l
;
...
...
@@ -128,8 +128,9 @@ void cb_reload_timer(void *data)
current_file
=
filelist
;
w
->
file
=
current_file
;
// reset window name in case of current file order,
// filename, or filelist_length has changed.
/* reset window name in case of current file order,
* filename, or filelist_length has changed.
*/
current_filename
=
slideshow_create_name
(
FEH_FILE
(
current_file
->
data
));
winwidget_rename
(
w
,
current_filename
);
free
(
current_filename
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment