comparison: gtk/gtkmain.c
gtk/gtkmain.c
- changeset 14636
- 5306c329992c
- parent 14623
- 046a118a3b04
- child 14743
- 2324d3eee038
equal
deleted
inserted
replaced
| 14635:68dfef995f7c | 14636:5306c329992c |
|---|---|
| 73 | 73 |
| 74 #ifdef HAVE_STARTUP_NOTIFICATION | 74 #ifdef HAVE_STARTUP_NOTIFICATION |
| 75 # define SN_API_NOT_YET_FROZEN | 75 # define SN_API_NOT_YET_FROZEN |
| 76 # include <libsn/sn-launchee.h> | 76 # include <libsn/sn-launchee.h> |
| 77 # include <gdk/gdkx.h> | 77 # include <gdk/gdkx.h> |
| 78 #endif | |
| 79 | |
| 80 #ifdef _WIN32 | |
| 81 # include "gtkwin32dep.h" | |
| 82 #endif | 78 #endif |
| 83 | 79 |
| 84 | 80 |
| 85 | 81 |
| 86 #ifdef HAVE_STARTUP_NOTIFICATION | 82 #ifdef HAVE_STARTUP_NOTIFICATION |
| 474 GList *accounts; | 470 GList *accounts; |
| 475 #ifdef HAVE_SIGNAL_H | 471 #ifdef HAVE_SIGNAL_H |
| 476 int sig_indx; /* for setting up signal catching */ | 472 int sig_indx; /* for setting up signal catching */ |
| 477 sigset_t sigset; | 473 sigset_t sigset; |
| 478 RETSIGTYPE (*prev_sig_disp)(int); | 474 RETSIGTYPE (*prev_sig_disp)(int); |
| 479 #endif | |
| 480 int opt; | |
| 481 gboolean gui_check; | |
| 482 gboolean debug_enabled; | |
| 483 #ifdef HAVE_SIGNAL_H | |
| 484 char errmsg[BUFSIZ]; | 475 char errmsg[BUFSIZ]; |
| 485 #ifndef DEBUG | 476 #ifndef DEBUG |
| 486 char *segfault_message_tmp; | 477 char *segfault_message_tmp; |
| 487 GError *error = NULL; | 478 GError *error = NULL; |
| 488 #endif | 479 #endif |
| 489 #endif | 480 #endif |
| 481 int opt; | |
| 482 gboolean gui_check; | |
| 483 gboolean debug_enabled; | |
| 490 | 484 |
| 491 struct option long_options[] = { | 485 struct option long_options[] = { |
| 492 {"config", required_argument, NULL, 'c'}, | 486 {"config", required_argument, NULL, 'c'}, |
| 493 {"debug", no_argument, NULL, 'd'}, | 487 {"debug", no_argument, NULL, 'd'}, |
| 494 {"help", no_argument, NULL, 'h'}, | 488 {"help", no_argument, NULL, 'h'}, |
