Mercurial > pidgin.yaz

comparison src/main.c @ 7538:357eb1c39b72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 8151] Robot101 made a nice patch (which I modified just slightly) to put our gtkspell attachment function that we use all throughout gaim into a utility function, which handles error checking and only does anything if gtkspell support is compiled in. It lets us remove a lot of #ifdef USE_GTKSPELL from places, and doesn't change any functionality. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 17 Nov 2003 06:48:01 +0000
parents 8beec54d1855
children f48c6e4db102
comparison
equal deleted inserted replaced
7537:083427fd8ba8 7538:357eb1c39b72
499 gaim_blist_set_ui_ops(gaim_gtk_blist_get_ui_ops()); 499 gaim_blist_set_ui_ops(gaim_gtk_blist_get_ui_ops());
500 gaim_notify_set_ui_ops(gaim_gtk_notify_get_ui_ops()); 500 gaim_notify_set_ui_ops(gaim_gtk_notify_get_ui_ops());
501 gaim_privacy_set_ui_ops(gaim_gtk_privacy_get_ui_ops()); 501 gaim_privacy_set_ui_ops(gaim_gtk_privacy_get_ui_ops());
502 gaim_request_set_ui_ops(gaim_gtk_request_get_ui_ops()); 502 gaim_request_set_ui_ops(gaim_gtk_request_get_ui_ops());
503 gaim_sound_set_ui_ops(gaim_gtk_sound_get_ui_ops()); 503 gaim_sound_set_ui_ops(gaim_gtk_sound_get_ui_ops());
504 gaim_connections_set_ui_ops(gaim_gtk_connections_get_ui_ops()); 504 gaim_connections_set_ui_ops(gaim_gtk_connections_get_ui_ops());
505 505
506 gaim_gtk_stock_init();
506 gaim_gtk_prefs_init(); 507 gaim_gtk_prefs_init();
507 gaim_gtk_blist_init(); 508 gaim_gtk_blist_init();
508 gaim_gtk_conversations_init(); 509 gaim_gtk_conversations_init();
509 gaim_gtk_pounces_init(); 510 gaim_gtk_pounces_init();
510 gaim_gtk_privacy_init(); 511 gaim_gtk_privacy_init();
757 opt_login_arg ? opt_login_arg : "NULL"); 758 opt_login_arg ? opt_login_arg : "NULL");
758 exit(0); 759 exit(0);
759 } 760 }
760 */ 761 */
761 762
762 gtk_set_locale(); 763 gui_check = gtk_init_check(&argc, &argv);
763 gui_check=gtk_init_check(&argc, &argv);
764 764
765 /* scan command-line options */ 765 /* scan command-line options */
766 opterr = 1; 766 opterr = 1;
767 while ((opt = getopt_long(argc, argv, 767 while ((opt = getopt_long(argc, argv,
768 #ifndef _WIN32 768 #ifndef _WIN32
814 if (opt_version) { 814 if (opt_version) {
815 printf("Gaim %s\n",VERSION); 815 printf("Gaim %s\n",VERSION);
816 return 0; 816 return 0;
817 } 817 }
818 818
819 #if GTK_CHECK_VERSION(2,2,0) 819 if (!gui_check) {
820 if(! gui_check) { 820 char *display = gdk_get_display();
821 const char *display_name_arg = gdk_get_display_arg_name (); 821
822 g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : " "); 822 g_warning("cannot open display: %s", display ? display : "unset");
823 return 1; 823 g_free(display);
824 } 824
825 #endif 825 return 1;
826 826 }
827 gaim_gtk_stock_init();
828 827
829 #ifdef _WIN32 828 #ifdef _WIN32
830 wgaim_init(hint); 829 wgaim_init(hint);
831 #endif 830 #endif
832 gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops()); 831 gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());