Changeset f97c1a6 for owl.h


Ignore:
Timestamp:
May 23, 2011, 9:09:44 PM (10 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, 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.
Message:
Merge branch 'g_main_loop'

The logic in owl_select_prune_bad_fds still needs to be reimplemented.

Conflicts:
	configure.ac
	owl.c
	select.c
File:
1 edited

Legend:

Unmodified
Added
Removed
  • owl.h

    rede073c rf97c1a6  
    552552  void (*destroy)(const struct _owl_io_dispatch *);  /* Destructor */
    553553  void *data;
     554  GPollFD pollfd;
    554555} 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;
    562556
    563557typedef struct _owl_popexec {
     
    568562  const owl_io_dispatch *dispatch;
    569563} owl_popexec;
    570 
    571 typedef struct _OwlGlobalNotifier OwlGlobalNotifier;
    572564
    573565typedef struct _owl_global {
     
    595587  gulong typwin_erase_id;
    596588  int rightshift;
    597   volatile sig_atomic_t resizepending;
     589  bool resizepending;
    598590  char *homedir;
    599591  char *confdir;
     
    618610  aim_conn_t bosconn;
    619611  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 */
    621613  char *aim_screenname;     /* currently logged in AIM screen name */
    622614  char *aim_screenname_for_filters;     /* currently logged in AIM screen name */
     
    628620  int haveaim;
    629621  int ignoreaimlogin;
    630   volatile sig_atomic_t got_err_signal; /* 1 if we got an unexpected signal */
    631   volatile siginfo_t err_signal_info;
    632622  owl_zbuddylist zbuddies;
    633623  GList *zaldlist;
     
    635625  struct termios startup_tio;
    636626  owl_list io_dispatch_list;
    637   owl_list psa_list;
    638627  GList *timerlist;
    639628  owl_timer *aim_nop_timer;
    640629  int load_initial_subs;
    641   volatile sig_atomic_t interrupted;
    642630  FILE *debug_file;
    643631  char *kill_buffer;
     632  int interrupt_count;
     633  GMutex *interrupt_lock;
    644634} owl_global;
    645635
Note: See TracChangeset for help on using the changeset viewer.