comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- branch
- release-2.x.y
- changeset 39010
- fbce915a7024
- parent 38206
- 3118251ccdef
- child 40764
- d687fda4047d
equal
deleted
inserted
replaced
| 38982:45020dd8cbd9 | 39010:fbce915a7024 |
|---|---|
| 68 #include "gtkthemes.h" | 68 #include "gtkthemes.h" |
| 69 #include "gtkutils.h" | 69 #include "gtkutils.h" |
| 70 #include "pidginstock.h" | 70 #include "pidginstock.h" |
| 71 #include "gtkwhiteboard.h" | 71 #include "gtkwhiteboard.h" |
| 72 | 72 |
| 73 #ifdef HAVE_X11 | |
| 74 #include <X11/Xlib.h> | |
| 75 #endif | |
| 76 | |
| 73 #ifdef HAVE_SIGNAL_H | 77 #ifdef HAVE_SIGNAL_H |
| 74 # include <signal.h> | 78 # include <signal.h> |
| 75 #endif | 79 #endif |
| 76 | 80 |
| 77 #include <getopt.h> | 81 #include <getopt.h> |
| 78 | |
| 79 | 82 |
| 80 #ifdef HAVE_SIGNAL_H | 83 #ifdef HAVE_SIGNAL_H |
| 81 | 84 |
| 82 /* | 85 /* |
| 83 * Lists of signals we wish to catch and those we wish to ignore. | 86 * Lists of signals we wish to catch and those we wish to ignore. |
| 747 | 750 |
| 748 search_path = g_build_filename(purple_user_dir(), "gtkrc-2.0", NULL); | 751 search_path = g_build_filename(purple_user_dir(), "gtkrc-2.0", NULL); |
| 749 gtk_rc_add_default_file(search_path); | 752 gtk_rc_add_default_file(search_path); |
| 750 g_free(search_path); | 753 g_free(search_path); |
| 751 | 754 |
| 755 #if defined(HAVE_X11) && defined(USE_VV) | |
| 756 /* GStreamer elements such as ximagesrc may require this */ | |
| 757 XInitThreads(); | |
| 758 #endif | |
| 759 | |
| 752 gui_check = gtk_init_check(&argc, &argv); | 760 gui_check = gtk_init_check(&argc, &argv); |
| 753 if (!gui_check) { | 761 if (!gui_check) { |
| 754 char *display = gdk_get_display(); | 762 char *display = gdk_get_display(); |
| 755 | 763 |
| 756 printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION); | 764 printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION); |
