Permalink
Browse files

more changes for merge

  • Loading branch information...
BurntSushi committed Jan 12, 2012
1 parent b287b89 commit fcef07870ddcb9ca7b24bd73c97943ddb71f784e
Showing with 0 additions and 20 deletions.
  1. +0 −1 obt/prop.h
  2. +0 −16 openbox/client.c
  3. +0 −3 openbox/debug.c
View
@@ -153,7 +153,6 @@ typedef enum {
OBT_PROP_NET_WM_USER_TIME,
/* OBT_PROP_NET_WM_USER_TIME_WINDOW, */
OBT_PROP_NET_FRAME_EXTENTS,
- OBT_PROP_NET_WM_WINDOW_OPACITY, /* non-standard */
/* application protocols */
OBT_PROP_NET_WM_PING,
View
@@ -2709,23 +2709,12 @@ void client_calc_layer(ObClient *self)
gboolean client_should_show(ObClient *self)
{
-<<<<<<< HEAD
- GSList *sit;
-
-=======
->>>>>>> master
if (self->iconic)
return FALSE;
if (client_normal(self) && screen_showing_desktop)
return FALSE;
if (screen_desktop_is_visible(self->desktop, TRUE))
return TRUE;
- /* if (self->desktop == screen_desktop || self->desktop == DESKTOP_ALL) */
- /* return TRUE; */
-/* */
- /* for (sit = screen_visible_desktops; sit; sit = g_slist_next(sit)) */
- /* if (self->desktop == sit->data) */
- /* return TRUE; */
return FALSE;
}
@@ -4167,12 +4156,7 @@ static void client_bring_windows_recursive(ObClient *self,
if (((helpers && client_helper(self)) ||
(modals && self->modal)) &&
-<<<<<<< HEAD
- /* ((self->desktop != desktop && self->desktop != DESKTOP_ALL) || */
(!screen_desktop_is_visible(self->desktop, TRUE) ||
-=======
- (!screen_compare_desktops(self->desktop, desktop) ||
->>>>>>> master
(iconic && self->iconic)))
{
if (iconic && self->iconic)
View
@@ -180,8 +180,6 @@ void ob_debug(const gchar *a, ...)
}
void ob_debug_type(ObDebugType type, const gchar *a, ...)
-<<<<<<< HEAD
-=======
{
va_list vl;
@@ -191,7 +189,6 @@ void ob_debug_type(ObDebugType type, const gchar *a, ...)
}
void ob_debug_show_prompts(void)
->>>>>>> master
{
if (prompt_queue) {
allow_prompts = FALSE; /* avoid recursive prompts */

0 comments on commit fcef078

Please sign in to comment.