Mercurial > pidgin.yaz
comparison src/main.c @ 6009:5cd7a10c6ade
[gaim-migrate @ 6457]
Renamed setup_stock() to gaim_gtk_stock_init(), to be more compliant with
the rest of the naming schemes. We now initialize it before registering the
debug stuff, so the debug window can use our stock icons. Also, added a
Pause stock icon, and used it in the debug window.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Fri, 04 Jul 2003 00:04:07 +0000 |
parents | 7711ef5338a0 |
children | 272c761c52e3 |
comparison
equal
deleted
inserted
replaced
6008:35679a3f2bcc | 6009:5cd7a10c6ade |
---|---|
522 load_smiley_theme(smile->path, TRUE); | 522 load_smiley_theme(smile->path, TRUE); |
523 } | 523 } |
524 } | 524 } |
525 | 525 |
526 gaim_gtk_blist_setup_sort_methods(); | 526 gaim_gtk_blist_setup_sort_methods(); |
527 setup_stock(); | |
528 | 527 |
529 #ifndef _WIN32 | 528 #ifndef _WIN32 |
530 /* use the nice PNG icon for all the windows */ | 529 /* use the nice PNG icon for all the windows */ |
531 icon_path = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL); | 530 icon_path = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL); |
532 icon = gdk_pixbuf_new_from_file(icon_path, NULL); | 531 icon = gdk_pixbuf_new_from_file(icon_path, NULL); |
835 if (opt_version) { | 834 if (opt_version) { |
836 printf("Gaim %s\n",VERSION); | 835 printf("Gaim %s\n",VERSION); |
837 return 0; | 836 return 0; |
838 } | 837 } |
839 | 838 |
839 /* This has to be done before the debug stuff. */ | |
840 gaim_gtk_stock_init(); | |
841 | |
840 gaim_prefs_init(); | 842 gaim_prefs_init(); |
841 gaim_gtk_prefs_init(); | 843 gaim_gtk_prefs_init(); |
842 | 844 |
843 /* This kind of has to be here.. sucks, but it's important. */ | 845 /* This kind of has to be here.. sucks, but it's important. */ |
844 gaim_set_debug_ui_ops(gaim_get_gtk_debug_ui_ops()); | 846 gaim_set_debug_ui_ops(gaim_get_gtk_debug_ui_ops()); |