comparison src/main.c @ 9594:15d09e546cee

[gaim-migrate @ 10437] I changed the 2 preferences dealing with auto-responses. It's a drop down box. Check it out. I also made Gaim not load .gaimrc committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 25 Jul 2004 22:13:03 +0000
parents 98f01c233a40
children 03be9d653123
comparison
equal deleted inserted replaced
9593:a64febebdd1e 9594:15d09e546cee
67 #ifdef HAVE_STARTUP_NOTIFICATION 67 #ifdef HAVE_STARTUP_NOTIFICATION
68 # define SN_API_NOT_YET_FROZEN 68 # define SN_API_NOT_YET_FROZEN
69 # include <libsn/sn-launchee.h> 69 # include <libsn/sn-launchee.h>
70 # include <gdk/gdkx.h> 70 # include <gdk/gdkx.h>
71 #endif 71 #endif
72
73 extern void load_prefs();
74 extern void load_pounces();
75 72
76 static GtkWidget *name; 73 static GtkWidget *name;
77 static GtkWidget *pass; 74 static GtkWidget *pass;
78 75
79 #ifdef HAVE_STARTUP_NOTIFICATION 76 #ifdef HAVE_STARTUP_NOTIFICATION
478 475
479 static void 476 static void
480 gaim_gtk_quit(void) 477 gaim_gtk_quit(void)
481 { 478 {
482 /* XXX? */ 479 /* XXX? */
480 /* YYY is there an XXX here? */
483 481
484 /* captain's log, stardate... */ 482 /* captain's log, stardate... */
485 /* LOG system_log(log_quit, NULL, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON); */ 483 /* LOG system_log(log_quit, NULL, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON); */
486 484
487 #ifdef USE_SM 485 #ifdef USE_SM
609 void (*prev_sig_disp)(); 607 void (*prev_sig_disp)();
610 #endif 608 #endif
611 int opt, opt_user = 0; 609 int opt, opt_user = 0;
612 int i; 610 int i;
613 gboolean gui_check; 611 gboolean gui_check;
612 gchar *gaimrc, *accountsxml;
614 613
615 struct option long_options[] = { 614 struct option long_options[] = {
616 {"acct", no_argument, NULL, 'a'}, 615 {"acct", no_argument, NULL, 'a'},
617 /*{"away", optional_argument, NULL, 'w'}, */ 616 /*{"away", optional_argument, NULL, 'w'}, */
618 {"help", no_argument, NULL, 'h'}, 617 {"help", no_argument, NULL, 'h'},
837 836
838 g_free(plugin_search_paths[2]); 837 g_free(plugin_search_paths[2]);
839 838
840 gaim_plugins_probe(NULL); 839 gaim_plugins_probe(NULL);
841 840
842 /* we only read ~/.gaimrc (load_prefs()) if there is no accounts.xml 841 /* XXX - Remove this check. Maybe in 2005. --KingAnt, 25 Jul 2004 */
843 * since prefs.xml existed alongside ~/.gaim in 0.64 */ 842 gaimrc = g_build_filename(gaim_home_dir(), ".gaimrc", NULL);
844 if (!gaim_accounts_load()) { 843 accountsxml = g_build_filename(gaim_user_dir(), "accounts.xml", NULL);
845 load_prefs(); 844 if (g_file_test(gaimrc, G_FILE_TEST_EXISTS) &&
846 gaim_prefs_sync(); 845 !g_file_test(accountsxml, G_FILE_TEST_EXISTS)) {
847 } 846 gaim_notify_error(NULL, NULL, _("Unable to load preferences"), _("Gaim was not able to load your preferences because they are stored in an old format that is no longer used. Please reconfigure your settings using the Preferences window."));
847 }
848 g_free(gaimrc);
849 g_free(accountsxml);
850
851 gaim_accounts_load();
848 852
849 gaim_set_blist(gaim_blist_new()); 853 gaim_set_blist(gaim_blist_new());
850 gaim_blist_load(); 854 gaim_blist_load();
851 855
852 gaim_prefs_load(); 856 gaim_prefs_load();
858 gaim_plugins_load_saved("/gaim/gtk/plugins/loaded"); 862 gaim_plugins_load_saved("/gaim/gtk/plugins/loaded");
859 863
860 gaim_pounces_load(); 864 gaim_pounces_load();
861 gaim_status_load(); 865 gaim_status_load();
862 866
863 load_pounces();
864 ui_main(); 867 ui_main();
865 868
866 #ifdef USE_SM 869 #ifdef USE_SM
867 session_init(argv[0], opt_session_arg, opt_config_dir_arg); 870 session_init(argv[0], opt_session_arg, opt_config_dir_arg);
868 #endif 871 #endif