- Timestamp:
- May 3, 2011, 5:23:55 PM (13 years ago)
- Parents:
- 4fd211f (diff), f578d18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
owl.h
r283ff1e rf578d18 550 550 void (*destroy)(const struct _owl_io_dispatch *); /* Destructor */ 551 551 void *data; 552 GPollFD pollfd; 552 553 } owl_io_dispatch; 553 554 typedef struct _owl_ps_action {555 int needs_gc;556 int (*callback)(struct _owl_ps_action *, void *);557 void (*destroy)(struct _owl_ps_action *);558 void *data;559 } owl_ps_action;560 554 561 555 typedef struct _owl_popexec { … … 566 560 const owl_io_dispatch *dispatch; 567 561 } owl_popexec; 568 569 typedef struct _OwlGlobalNotifier OwlGlobalNotifier;570 562 571 563 typedef struct _owl_global { … … 593 585 gulong typwin_erase_id; 594 586 int rightshift; 595 volatile sig_atomic_tresizepending;587 bool resizepending; 596 588 char *homedir; 597 589 char *confdir; … … 618 610 aim_conn_t bosconn; 619 611 int aim_loggedin; /* true if currently logged into AIM */ 620 int aim_doprocessing; /* true if we should process AIM events (like pending login)*/612 GSource *aim_event_source; /* where we get our AIM events from */ 621 613 char *aim_screenname; /* currently logged in AIM screen name */ 622 614 char *aim_screenname_for_filters; /* currently logged in AIM screen name */ … … 628 620 int haveaim; 629 621 int ignoreaimlogin; 630 volatile sig_atomic_t got_err_signal; /* 1 if we got an unexpected signal */631 volatile siginfo_t err_signal_info;632 622 owl_zbuddylist zbuddies; 633 623 GList *zaldlist; … … 635 625 struct termios startup_tio; 636 626 owl_list io_dispatch_list; 637 owl_list psa_list;638 627 GList *timerlist; 639 628 owl_timer *aim_nop_timer; 640 629 int load_initial_subs; 641 volatile sig_atomic_t interrupted;642 630 FILE *debug_file; 643 631 char *kill_buffer; 632 int interrupt_count; 633 GMutex *interrupt_lock; 644 634 } owl_global; 645 635
Note: See TracChangeset
for help on using the changeset viewer.