diff options
author | mathias <mathias> | 2005-06-18 13:32:56 (GMT) |
---|---|---|
committer | mathias <mathias> | 2005-06-18 13:32:56 (GMT) |
commit | a8d7752804bcf5ed21dd3df2464a153227391422 (patch) | |
tree | 8c8dd381352d271ffc51236bf85f01e5eb0352b0 | |
parent | 3d722f24284f926448085394690f87d949c017bc (diff) | |
download | fluxbox_pavel-a8d7752804bcf5ed21dd3df2464a153227391422.zip fluxbox_pavel-a8d7752804bcf5ed21dd3df2464a153227391422.tar.bz2 |
Screen.cc: not used code
fbgm.in: added amarok
-rw-r--r-- | src/Screen.cc | 4 | ||||
-rwxr-xr-x | util/fluxbox-generate_menu.in | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 8de0345..5b903b1 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1181,8 +1181,6 @@ FluxboxWindow *BScreen::createWindow(Window client) { | |||
1181 | return 0; | 1181 | return 0; |
1182 | } | 1182 | } |
1183 | 1183 | ||
1184 | bool new_win = false; | ||
1185 | |||
1186 | // check if it should be grouped with something else | 1184 | // check if it should be grouped with something else |
1187 | FluxboxWindow *win; | 1185 | FluxboxWindow *win; |
1188 | if ((win = findGroupLeft(*winclient)) != 0) { | 1186 | if ((win = findGroupLeft(*winclient)) != 0) { |
@@ -1198,8 +1196,6 @@ FluxboxWindow *BScreen::createWindow(Window client) { | |||
1198 | winFrameTheme(), | 1196 | winFrameTheme(), |
1199 | *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); | 1197 | *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); |
1200 | 1198 | ||
1201 | new_win = true; | ||
1202 | |||
1203 | if (!win->isManaged()) { | 1199 | if (!win->isManaged()) { |
1204 | delete win; | 1200 | delete win; |
1205 | return 0; | 1201 | return 0; |
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in index cbc0483..eafb793 100755 --- a/util/fluxbox-generate_menu.in +++ b/util/fluxbox-generate_menu.in | |||
@@ -1556,7 +1556,7 @@ append_submenu "${MULTIMEDIAMENU}" | |||
1556 | append_submenu "${MUSICMENU}" | 1556 | append_submenu "${MUSICMENU}" |
1557 | normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix kscd \ | 1557 | normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix kscd \ |
1558 | grecord kmidi xplaycd soundtracker grip easytag audacity \ | 1558 | grecord kmidi xplaycd soundtracker grip easytag audacity \ |
1559 | zinf rhythmbox kaboodle beep-media-player | 1559 | zinf rhythmbox kaboodle beep-media-player amarok |
1560 | cli_find cdcd cplay alsamixer orpheus mp3blaster | 1560 | cli_find cdcd cplay alsamixer orpheus mp3blaster |
1561 | append_menu_end | 1561 | append_menu_end |
1562 | 1562 | ||