Changes in zephyr.c [b848e30:c66ec48]
Legend:
- Unmodified
- Added
- Removed
-
zephyr.c
rb848e30 rc66ec48 48 48 struct sockaddr_in sin; 49 49 ZNotice_t req; 50 GIOChannel *channel; 50 51 51 52 /* … … 91 92 } 92 93 93 owl_select_add_io_dispatch(ZGetFD(), OWL_IO_READ|OWL_IO_EXCEPT, &owl_zephyr_finish_initialization, NULL, NULL); 94 } 95 96 void owl_zephyr_finish_initialization(const owl_io_dispatch *d, void *data) { 94 channel = g_io_channel_unix_new(ZGetFD()); 95 g_io_add_watch(channel, G_IO_IN | G_IO_ERR | G_IO_HUP, 96 &owl_zephyr_finish_initialization, NULL); 97 g_io_channel_unref(channel); 98 } 99 100 gboolean owl_zephyr_finish_initialization(GIOChannel *source, GIOCondition condition, void *data) { 97 101 Code_t code; 98 102 char *perl; 99 103 GSource *event_source; 100 104 101 owl_select_remove_io_dispatch(d);102 103 105 ZClosePort(); 104 106 105 107 if ((code = ZInitialize()) != ZERR_NONE) { 106 108 owl_function_error("Initializing Zephyr: %s", error_message(code)); 107 return ;109 return FALSE; 108 110 } 109 111 110 112 if ((code = ZOpenPort(NULL)) != ZERR_NONE) { 111 113 owl_function_error("Initializing Zephyr: %s", error_message(code)); 112 return ;114 return FALSE; 113 115 } 114 116 … … 143 145 perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()"); 144 146 g_free(perl); 147 return FALSE; 145 148 } 146 149 … … 1432 1435 #endif 1433 1436 1434 void owl_zephyr_buddycheck_timer(owl_timer *t,void *data)1437 gboolean owl_zephyr_buddycheck_timer(void *data) 1435 1438 { 1436 1439 if (owl_global_is_pseudologins(&g)) { … … 1440 1443 owl_function_debugmsg("Warning: owl_zephyr_buddycheck_timer call pointless; timer should have been disabled"); 1441 1444 } 1445 return TRUE; 1442 1446 } 1443 1447 … … 1510 1514 event_source = (owl_zephyr_event_source*) source; 1511 1515 event_source->poll_fd.fd = fd; 1512 event_source->poll_fd.events = G_IO_IN | G_IO_HUP | G_IO_ PRI | G_IO_ERR;1516 event_source->poll_fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR; 1513 1517 g_source_add_poll(source, &event_source->poll_fd); 1514 1518
Note: See TracChangeset
for help on using the changeset viewer.