X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fscreen.c;h=1eb0051df609b4e55bfd5c98ee5857de5ffb40c0;hb=485fbff15da1a9001e610b3274747d76c1af57cb;hp=8835c1b212b9ee83ad194b339c03a39987cbc17e;hpb=e1fd32bcf5a07d8b9ab774d0f690112dec29cc8e;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 8835c1b2..1eb0051d 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -12,7 +12,6 @@
 #include "frame.h"
 #include "focus.h"
 #include "popup.h"
-#include "dispatch.h"
 #include "extensions.h"
 #include "render/render.h"
 
@@ -67,6 +66,7 @@ static gboolean replace_wm()
 
     wm_sn = g_strdup_printf("WM_S%d", ob_screen);
     wm_sn_atom = XInternAtom(ob_display, wm_sn, FALSE);
+    g_free(wm_sn);
 
     current_wm_sn_owner = XGetSelectionOwner(ob_display, wm_sn_atom);
     if (current_wm_sn_owner) {
@@ -179,8 +179,6 @@ gboolean screen_annex()
     }
 
 
-    ob_debug("Managing screen %d\n", ob_screen);
-
     set_root_cursor();
 
     /* set the OPENBOX_PID hint */
@@ -198,7 +196,7 @@ gboolean screen_annex()
                window, screen_support_win);
 
     /* set the _NET_SUPPORTED_ATOMS hint */
-    num_support = 61;
+    num_support = 50;
     i = 0;
     supported = g_new(guint32, num_support);
     supported[i++] = prop_atoms.net_current_desktop;
@@ -251,17 +249,6 @@ gboolean screen_annex()
     supported[i++] = prop_atoms.net_wm_state_below;
     supported[i++] = prop_atoms.net_moveresize_window;
     supported[i++] = prop_atoms.net_wm_moveresize;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_topleft;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_top;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_topright;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_right;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_bottomright;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_bottom;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_bottomleft;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_left;
-    supported[i++] = prop_atoms.net_wm_moveresize_move;
-    supported[i++] = prop_atoms.net_wm_moveresize_size_keyboard;
-    supported[i++] = prop_atoms.net_wm_moveresize_move_keyboard;
     g_assert(i == num_support);
 /*
   supported[] = prop_atoms.net_wm_action_stick;
@@ -414,8 +401,6 @@ void screen_set_num_desktops(guint num)
     /* change our struts/area to match (after moving windows) */
     screen_update_areas();
 
-    dispatch_ob(Event_Ob_NumDesktops, num, old);
-
     /* change our desktop if we're on one that no longer exists! */
     if (screen_desktop >= screen_num_desktops)
 	screen_set_desktop(num - 1);
@@ -468,8 +453,6 @@ void screen_set_desktop(guint num)
 #ifdef DEBUG_FOCUS
     ob_debug("/switch fallback\n");
 #endif
-
-    dispatch_ob(Event_Ob_Desktop, num, old);
 }
 
 static void get_row_col(guint d, guint *r, guint *c)
@@ -700,9 +683,10 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
         d = translate_row_col(r, c);
     }
 
-    if (config_desktop_popup)
+    if (config_desktop_popup) {
         popup_cycle(d, TRUE);
-    return d;
+        return d;
+    }
 
 done_cycle:
     first = TRUE;
@@ -858,8 +842,6 @@ void screen_show_desktop(gboolean show)
     show = !!show; /* make it boolean */
     PROP_SET32(RootWindow(ob_display, ob_screen),
                net_showing_desktop, cardinal, show);
-
-    dispatch_ob(Event_Ob_ShowDesktop, show, 0);
 }
 
 void screen_install_colormap(ObClient *client, gboolean install)