Commit 1d8d374f authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Convert C++ style comments to /* */

parent d87c8db1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;
+6 −5
Original line number Diff line number Diff line
@@ -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);