Mercurial > pidgin

comparison src/gtkmain.c @ 10447:6feef0a9098a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11712] A few minor improvements and some documentation updates. Conscious evolution in the back of your mind... committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 29 Dec 2004 21:53:59 +0000
parents f7f06cb69d5e
children 6a20307ef8dc
comparison
equal deleted inserted replaced
10446:904d03bfccce 10447:6feef0a9098a
436 gboolean opt_version = FALSE; 436 gboolean opt_version = FALSE;
437 char *opt_config_dir_arg = NULL; 437 char *opt_config_dir_arg = NULL;
438 char *opt_login_arg = NULL; 438 char *opt_login_arg = NULL;
439 char *opt_session_arg = NULL; 439 char *opt_session_arg = NULL;
440 int dologin_ret = -1; 440 int dologin_ret = -1;
441 char *plugin_search_paths[3]; 441 char *search_path;
442 #if HAVE_SIGNAL_H 442 #if HAVE_SIGNAL_H
443 int sig_indx; /* for setting up signal catching */ 443 int sig_indx; /* for setting up signal catching */
444 sigset_t sigset; 444 sigset_t sigset;
445 void (*prev_sig_disp)(); 445 void (*prev_sig_disp)();
446 #endif 446 #endif
592 wgaim_init(hint); 592 wgaim_init(hint);
593 #endif 593 #endif
594 gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops()); 594 gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());
595 gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops()); 595 gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops());
596 596
597 /* Set plugin search directories */
598 gaim_plugins_add_search_path(LIBDIR);
599 gaim_plugins_add_search_path(gaim_user_dir());
600 search_path = g_build_filename(gaim_user_dir(), "plugins", NULL);
601 gaim_plugins_add_search_path(search_path);
602 g_free(search_path);
603
597 if (!gaim_core_init(GAIM_GTK_UI)) { 604 if (!gaim_core_init(GAIM_GTK_UI)) {
598 fprintf(stderr, 605 fprintf(stderr,
599 "Initialization of the Gaim core failed. Dumping core.\n" 606 "Initialization of the Gaim core failed. Dumping core.\n"
600 "Please report this!\n"); 607 "Please report this!\n");
601 abort(); 608 abort();
602 } 609 }
603 610
604 gaim_debug_set_enabled(debug_enabled); 611 gaim_debug_set_enabled(debug_enabled);
605 612
606 plugin_search_paths[0] = g_strdup(LIBDIR); 613 /* TODO: Do this in gaim_core_init() instead of here */
607 plugin_search_paths[1] = g_strdup(gaim_user_dir());
608 plugin_search_paths[2] = g_build_filename(gaim_user_dir(), "plugins", NULL);
609
610 gaim_plugins_set_search_paths(sizeof(plugin_search_paths) /
611 sizeof(*plugin_search_paths),
612 plugin_search_paths);
613
614 g_free(plugin_search_paths[0]);
615 g_free(plugin_search_paths[1]);
616 g_free(plugin_search_paths[2]);
617
618 gaim_plugins_probe(NULL); 614 gaim_plugins_probe(NULL);
619 615
620 /* TODO: Remove this check. Maybe in 2005. --KingAnt, 25 Jul 2004 */ 616 /* TODO: Remove this check. Maybe in 2005. --KingAnt, 25 Jul 2004 */
621 gaimrc = g_build_filename(gaim_home_dir(), ".gaimrc", NULL); 617 gaimrc = g_build_filename(gaim_home_dir(), ".gaimrc", NULL);
622 accountsxml = g_build_filename(gaim_user_dir(), "accounts.xml", NULL); 618 accountsxml = g_build_filename(gaim_user_dir(), "accounts.xml", NULL);