comparison src/main.c @ 7438:d3400dadc594

[gaim-migrate @ 8043] "This patch solves the problem, that "gaim --version" or "gaim --help" only works, if DISPLAY is set properly. With this patch it's possible to call "--version" or "--help" without X. This is for instance useful for shell scripts, which check Gaim's version." --Bjoern Voigt committer: Tailor Script <[e-mail]>

7437:bb9c06e7cf6d

	sigset_t sigset;
	void (*prev_sig_disp)();
#endif
	int opt, opt_user = 0;
	int i;

	struct option long_options[] = {
		{"acct", no_argument, NULL, 'a'},
		/*{"away", optional_argument, NULL, 'w'}, */
		{"help", no_argument, NULL, 'h'},

	   exit(0);
	   }
	 */

	gtk_set_locale();
	gtk_init(&argc, &argv);

	/* scan command-line options */
	opterr = 1;
	while ((opt = getopt_long(argc, argv,
#ifndef _WIN32

	if (opt_version) {
		printf("Gaim %s\n",VERSION);
		return 0;
	}

	gaim_gtk_stock_init();

	gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());

#ifdef _WIN32

7438:d3400dadc594

	sigset_t sigset;
	void (*prev_sig_disp)();
#endif
	int opt, opt_user = 0;
	int i;
	gboolean gui_check;

	struct option long_options[] = {
		{"acct", no_argument, NULL, 'a'},
		/*{"away", optional_argument, NULL, 'w'}, */
		{"help", no_argument, NULL, 'h'},

	   exit(0);
	   }
	 */

	gtk_set_locale();
	gui_check=gtk_init_check(&argc, &argv);

	/* scan command-line options */
	opterr = 1;
	while ((opt = getopt_long(argc, argv,
#ifndef _WIN32

	if (opt_version) {
		printf("Gaim %s\n",VERSION);
		return 0;
	}

	if(! gui_check) {
	    const char *display_name_arg = gdk_get_display_arg_name ();
	    g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : " ");
	    return 1;
	}

	gaim_gtk_stock_init();

	gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());

#ifdef _WIN32