after we create channels for the configured networks, destroy the
default channel Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
f9593aea16
commit
76fe641ef0
|
@ -343,10 +343,6 @@ _window_create(void)
|
||||||
_window_channel_focus(chl);
|
_window_channel_focus(chl);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME: Remove. Only for testing */
|
|
||||||
/* if ((chl = _window_channel_create("Test"))) */
|
|
||||||
/* _window_channel_count_update(chl); */
|
|
||||||
|
|
||||||
/* update window transparency from config */
|
/* update window transparency from config */
|
||||||
_window_update();
|
_window_update();
|
||||||
|
|
||||||
|
@ -733,17 +729,14 @@ _window_network_channels_create(Express_Network *net)
|
||||||
Channel *chl;
|
Channel *chl;
|
||||||
Express_Server *srv;
|
Express_Server *srv;
|
||||||
const char *name, *srv_name = NULL;
|
const char *name, *srv_name = NULL;
|
||||||
/* int i = -1; */
|
int i = -1;
|
||||||
|
|
||||||
/* remove the default channel window
|
/* remove the default channel window
|
||||||
*
|
*
|
||||||
* TODO:
|
* TODO:
|
||||||
* NB: This COULD become a config option for 'server message window'
|
* NB: This COULD become a config option for 'server message window'
|
||||||
* and optionally be left open to display server messages */
|
* and optionally be left open to display server messages */
|
||||||
/* _window_channel_destroy("Default"); */
|
_window_channel_destroy("Default");
|
||||||
|
|
||||||
/* if ((chl = _window_channel_find("Default"))) */
|
|
||||||
/* _window_channel_unswallow(chl); */
|
|
||||||
|
|
||||||
/* get the name of this network */
|
/* get the name of this network */
|
||||||
name = express_network_name_get(net);
|
name = express_network_name_get(net);
|
||||||
|
@ -770,16 +763,16 @@ _window_network_channels_create(Express_Network *net)
|
||||||
if (!(chl = _window_channel_create(cfg_chl->name, srv_name)))
|
if (!(chl = _window_channel_create(cfg_chl->name, srv_name)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* if (i < 0) */
|
if (i < 0)
|
||||||
/* { */
|
{
|
||||||
/* if this is the first channel, swallow it */
|
/* if this is the first channel, swallow it */
|
||||||
/* _window_channel_swallow(chl); */
|
_window_channel_swallow(chl);
|
||||||
|
|
||||||
/* focus this channel */
|
/* focus this channel */
|
||||||
/* _window_channel_focus(chl); */
|
_window_channel_focus(chl);
|
||||||
/* } */
|
}
|
||||||
|
|
||||||
/* i++; */
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue