geeqie: src/main.c comparison

comparison src/main.c @ 442:4b2d7f9af171

Big whitespaces cleanup: - drop whitespaces at end of lines - convert eight spaces to tab at start of lines - drop spurious spaces mixed with tabs - remove empty lines at end of files

author	zas_
date	Sun, 20 Apr 2008 13:04:57 +0000
parents	5ddcf93278c7
children	ddabc4873a3f

comparison

equal deleted inserted replaced

-:08eb7137cd94
+:4b2d7f9af171
 /*
 *-----------------------------------------------------------------------------
 * misc (public)
 *-----------------------------------------------------------------------------
 */
 GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
 		      const gchar *icon_file, const gchar *subtitle)
 {
 	gchar *title;
 	GtkWidget *window;
 	window = gtk_window_new(type);
 	if (!window) return NULL;
 	if (subtitle)
 		{
 		title = g_strdup_printf("%s - %s", subtitle, GQ_APPNAME);
 		}
 	else
 		{
 		title = g_strdup_printf("%s", GQ_APPNAME);
 		}
 	gtk_window_set_title(GTK_WINDOW(window), title);
 	g_free(title);
 	window_set_icon(window, icon, icon_file);
 	gtk_window_set_role(GTK_WINDOW(window), name);
 	struct timeval tv = {0, 0};
 	static struct timeval delta = {0, 0};
 	gettimeofday(&tv, NULL);
 	if (start_tv.tv_sec == 0) start_tv = tv;
 	tv.tv_sec -= start_tv.tv_sec;
 	if (tv.tv_usec >= start_tv.tv_usec)
 		tv.tv_usec -= start_tv.tv_usec;
 	else
 		{
 		tv.tv_usec += 1000000 - start_tv.tv_usec;
 		tv.tv_sec -= 1;
 	previous = tv;
 	started = 1;
 	g_snprintf(timestr, sizeof(timestr), "%5d.%06d (+%05d.%06d)", (int)tv.tv_sec, (int)tv.tv_usec, (int)delta.tv_sec, (int)delta.tv_usec);
 	return timestr;
 }
 /*
 *-----------------------------------------------------------------------------
 /*
 *-----------------------------------------------------------------------------
 * help window
 *-----------------------------------------------------------------------------
 */
 static GtkWidget *help_window = NULL;
 static void help_window_destroy_cb(GtkWidget *window, gpointer data)
 {
 		}
 	{
 	gchar *title = g_strdup_printf("%s - %s", _("Help"), GQ_APPNAME);
 	help_window = help_window_new(title, GQ_WMCLASS, "help",
-GQ_HELPDIR "/README", key);
+				      GQ_HELPDIR "/README", key);
 	g_free(title);
 	}
 	g_signal_connect(G_OBJECT(help_window), "destroy",
 			 G_CALLBACK(help_window_destroy_cb), NULL);
 }
 static RemoteCommandEntry remote_commands[] = {
 	/* short, long                  callback,               extra, prefer,description */
 	{ "-n", "--next",               gr_image_next,          FALSE, FALSE, N_("next image") },
 	{ "-b", "--back",               gr_image_prev,          FALSE, FALSE, N_("previous image") },
 	{ NULL, "--first",              gr_image_first,         FALSE, FALSE, N_("first image") },
-{ NULL, "--last",               gr_image_last,          FALSE, FALSE, N_("last image") },
+	{ NULL, "--last",               gr_image_last,          FALSE, FALSE, N_("last image") },
 	{ "-f", "--fullscreen",         gr_fullscreen_toggle,   FALSE, TRUE,  N_("toggle full screen") },
 	{ "-fs","--fullscreen-start",   gr_fullscreen_start,    FALSE, FALSE, N_("start full screen") },
 	{ "-fS","--fullscreen-stop",    gr_fullscreen_stop,     FALSE, FALSE, N_("stop full screen") },
 	{ "-s", "--slideshow",          gr_slideshow_toggle,	FALSE, TRUE,  N_("toggle slide show") },
 	{ "-ss","--slideshow-start",    gr_slideshow_start,     FALSE, FALSE, N_("start slide show") },
 /*
 *-----------------------------------------------------------------------------
 * command line parser (private) hehe, who needs popt anyway?
 *-----------------------------------------------------------------------------
 */
 static gint startup_blank = FALSE;
 static gint startup_full_screen = FALSE;
 static gint startup_in_slideshow = FALSE;
 static gint startup_command_line_collection = FALSE;
 static void parse_command_line_add_file(const gchar *file_path, gchar **path, gchar **file,
-				        GList **list, GList **collection_list)
+					GList **list, GList **collection_list)
 {
 	gchar *path_parsed;
 	path_parsed = g_strdup(file_path);
 	parse_out_relatives(path_parsed);
 }
 static void parse_command_line_process_dir(const gchar *dir, gchar **path, gchar **file,
 					   GList **list, gchar **first_dir)
 {
 	if (!*list && !*first_dir)
 		{
 		*first_dir = g_strdup(dir);
 		}
 	else
 }
 static void parse_command_line_process_file(const gchar *file_path, gchar **path, gchar **file,
 					    GList **list, GList **collection_list, gchar **first_dir)
 {
 	if (*first_dir)
 		{
 		parse_command_line_add_dir(*first_dir, path, file, list);
 		g_free(*first_dir);
 		*first_dir = NULL;
 #ifdef DEBUG
 				print_term(_("  --debug[=level]            turn on debug output\n"));
 #endif
 				print_term(_("  -v, --version              print version info\n"));
 				print_term(_("  -h, --help                 show this message\n\n"));
 #if 0
 				/* these options are not officially supported!
 				 * only for testing new features, no need to translate them */
 				print_term(  "  --alternate                use alternate similarity algorithm\n");
 #endif
 				exit (0);
 				}
 			else if (!remote_do)
 				{
 				printf_term(_("invalid or ignored: %s\nUse --help for options\n"), cmd_line);
 	gint len = strlen(debug_option);
 	if (argc > 1)
 		{
 		gint i;
 		for (i = 1; i < argc; i++)
 			{
 			const gchar *cmd_line = argv[i];
 			if (strncmp(cmd_line, debug_option, len) == 0)
 				{
 /*
 *-----------------------------------------------------------------------------
 * startup, init, and exit
 *-----------------------------------------------------------------------------
 */
 #define RC_HISTORY_NAME "history"
 static void keys_load(void)
 {
 	buf = g_strconcat(homedir(), "/", path, NULL);
 	if (!isdir(buf))
 		{
 		printf_term(_("Creating %s dir:%s\n"), GQ_APPNAME, buf);
 		if (!mkdir_utf8(buf, 0755))
 			{
 			printf_term(_("Could not create dir:%s\n"), buf);
 			}
 		}
 	gchar *buf;
 	gchar *bufl;
 	/* init execution time counter*/
 	get_exec_time();
 	/* setup locale, i18n */
 	gtk_set_locale();
 	bindtextdomain(PACKAGE, GQ_LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
 	textdomain(PACKAGE);
 	/* setup random seed for random slideshow */
-srand(time(NULL));
+	srand(time(NULL));
 #if 1
 	printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION);
 #endif
 	parse_command_line_for_debug_option(argc, argv);
 	check_for_home_path(GQ_CACHE_RC_METADATA);
 	keys_load();
 	filter_add_defaults();
 	filter_rebuild();
 	buf = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);
 	bufl = path_from_utf8(buf);
 	gtk_accel_map_load(bufl);
 	g_free(bufl);
 	g_free(buf);

Mercurial > geeqie

comparison src/main.c @ 442:4b2d7f9af171