d4312..94068 (2009-05-07 23:45)
(2009-05-08 19:59) 4c838..6fbd0
Add missing #ifdef to make --disable-session compile.
| src/WindowManager.cc | |
| 144 | @@ -144,6 +144,7 @@ |
| 144 | } |
| 145 | } |
| 146 | |
| 147 | #ifdef HAVE_SESSION |
| 148 | /** |
| 149 | * Handler setting ice connections |
| 150 | */ |
| ... | |
| 160 | @@ -159,7 +160,7 @@ |
| 160 | WindowManager::instance()->setIceFd(0); |
| 161 | } |
| 162 | } |
| 162 | |
| 164 | #endif // HAVE_SESSION |
| 165 | } // extern "C" |
| 166 | |
| 167 | |
| ... | |
| 224 | @@ -223,7 +224,10 @@ |
| 224 | #endif // HARBOUR |
| 225 | _cmd_dialog(0), _search_dialog(0), |
| 226 | _status_window(0), _workspace_indicator(0), |
| 226 | _max_fd(0), _dpy_fd(0), _ice_fd(0), _ice_conn(0), |
| 228 | _max_fd(0), _dpy_fd(0), |
| 229 | #ifdef HAVE_SESSION |
| 230 | _ice_fd(0), _ice_conn(0), |
| 231 | #endif // HAVE_SESSION |
| 232 | _command_line(command_line), |
| 233 | _startup(false), _shutdown(false), _reload(false), |
| 234 | _allow_grouping(true), _hint_wo(0), _root_wo(0) |
| ... | |
| src/WindowManager.hh | |
| 83 | @@ -83,11 +83,13 @@ |
| 83 | /**< Return shutdown flag, set to tru to shutdown window manager. */ |
| 84 | bool *getShutdownFlag(void) { return &_shutdown; } |
| 85 | |
| 86 | #ifdef HAVE_SESSION |
| 87 | void setIceConn(IceConn ice_conn) { _ice_conn = ice_conn; } |
| 88 | void setIceFd(int ice_fd) { |
| 89 | _ice_fd = ice_fd; |
| 90 | _max_fd = std::max(_dpy_fd, _ice_fd) + 1; |
| 91 | } |
| 92 | #endif // HAVE_SESSION |
| 93 | |
| 94 | // get "base" classes |
| 95 | inline PScreen *getScreen(void) const { return _screen; } |
| ... | |