- Timestamp:
- May 23, 2011, 9:09:44 PM (13 years ago)
- Branches:
- master, release-1.10, release-1.8, release-1.9
- Children:
- 33b6431b
- Parents:
- 4c7c21f (diff), 1d21d9f (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
rede073c rf97c1a6 552 552 void (*destroy)(const struct _owl_io_dispatch *); /* Destructor */ 553 553 void *data; 554 GPollFD pollfd; 554 555 } owl_io_dispatch; 555 556 typedef struct _owl_ps_action {557 int needs_gc;558 int (*callback)(struct _owl_ps_action *, void *);559 void (*destroy)(struct _owl_ps_action *);560 void *data;561 } owl_ps_action;562 556 563 557 typedef struct _owl_popexec { … … 568 562 const owl_io_dispatch *dispatch; 569 563 } owl_popexec; 570 571 typedef struct _OwlGlobalNotifier OwlGlobalNotifier;572 564 573 565 typedef struct _owl_global { … … 595 587 gulong typwin_erase_id; 596 588 int rightshift; 597 volatile sig_atomic_tresizepending;589 bool resizepending; 598 590 char *homedir; 599 591 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.