comparison: src/aim.c
src/aim.c
- changeset 724
- 377d98958f62
- parent 705
- 64ce9c59881c
- child 730
- 3fcf70ff6111
equal
deleted
inserted
replaced
| 723:ed02068d9585 | 724:377d98958f62 |
|---|---|
| 20 */ | 20 */ |
| 21 | 21 |
| 22 #ifdef HAVE_CONFIG_H | 22 #ifdef HAVE_CONFIG_H |
| 23 #include "../config.h" | 23 #include "../config.h" |
| 24 #endif | 24 #endif |
| 25 #ifdef USE_THEMES | 25 #ifdef USE_GNOME |
| 26 #include <gnome.h> | 26 #include <gnome.h> |
| 27 #else | 27 #else |
| 28 #ifdef USE_APPLET | 28 #ifdef USE_APPLET |
| 29 #include "gnome_applet_mgr.h" | 29 #include "gnome_applet_mgr.h" |
| 30 #include <gnome.h> | 30 #include <gnome.h> |
| 31 #endif /* USE_APPLET */ | 31 #endif /* USE_APPLET */ |
| 32 #endif /* USE_THEMES */ | 32 #endif /* USE_GNOME */ |
| 33 #ifdef GAIM_PLUGINS | 33 #ifdef GAIM_PLUGINS |
| 34 #include <dlfcn.h> | 34 #include <dlfcn.h> |
| 35 #endif /* GAIM_PLUGINS */ | 35 #endif /* GAIM_PLUGINS */ |
| 36 #include <gtk/gtk.h> | 36 #include <gtk/gtk.h> |
| 37 #include <gdk/gdkx.h> | 37 #include <gdk/gdkx.h> |
| 563 return 0; | 563 return 0; |
| 564 } | 564 } |
| 565 | 565 |
| 566 #ifdef USE_APPLET | 566 #ifdef USE_APPLET |
| 567 init_applet_mgr(argc, argv); | 567 init_applet_mgr(argc, argv); |
| 568 #elif defined USE_THEMES | 568 #elif defined USE_GNOME |
| 569 gnome_init("GAIM",NULL,argc,argv); | 569 gnome_init(PACKAGE,VERSION,argc,argv); |
| 570 #else | 570 #else |
| 571 gtk_init(&argc, &argv); | 571 gtk_init(&argc, &argv); |
| 572 #endif /* USE_THEMES */ | 572 #endif /* USE_GNOME */ |
| 573 | 573 |
| 574 set_defaults(); | 574 set_defaults(); |
| 575 load_prefs(); | 575 load_prefs(); |
| 576 | 576 |
| 577 if (general_options & OPT_GEN_DEBUG) | 577 if (general_options & OPT_GEN_DEBUG) |
