Merge branch 'backport' into work
Dana Jansens danakj@orodu.net
6 files changed,
13 insertions(+),
14 deletions(-)
M
.gitignore
→
.gitignore
@@ -52,7 +52,7 @@ render/obrender-4.0.pc
obt/obt-4.0.pc tools/gnome-panel-control/gnome-panel-control tools/gdm-control/gdm-control -tools/obprop/obprop +tools/obxprop/obxprop version.h .libs .deps
M
Makefile.am
→
Makefile.am
@@ -34,7 +34,7 @@ bin_PROGRAMS = \
openbox/openbox \ tools/gdm-control/gdm-control \ tools/gnome-panel-control/gnome-panel-control \ - tools/obprop/obprop + tools/obxprop/obxprop dist_secretbin_SCRIPTS = \ tools/xdg-autostart/xdg-autostart@@ -290,16 +290,16 @@ $(X_LIBS)
tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools/gnome-panel-control/gnome-panel-control.c -## obprop ## +## obxprop ## -tools_obprop_obprop_CPPFLAGS = \ +tools_obxprop_obxprop_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(X_CFLAGS) -tools_obprop_obprop_LDADD = \ +tools_obxprop_obxprop_LDADD = \ $(GLIB_LIBS) \ $(X_LIBS) -tools_obprop_obprop_SOURCES = \ - tools/obprop/obprop.c +tools_obxprop_obxprop_SOURCES = \ + tools/obxprop/obxprop.c ## gdm-control ##
M
data/rc.xml
→
data/rc.xml
@@ -687,10 +687,10 @@ <!--
# this is an example with comments through out. use these to make your # own rules, but without the comments of course. - <application name="the window's _OB_NAME property (see obprop)" - class="the window's _OB_CLASS property (see obprop)" - role="the window's _OB_ROLE property (see obprop)" - type="the window's _NET_WM_WINDOW_TYPE (see obprob).. + <application name="the window's _OB_NAME property (see obxprop)" + class="the window's _OB_CLASS property (see obxprop)" + role="the window's _OB_ROLE property (see obxprop)" + type="the window's _NET_WM_WINDOW_TYPE (see obxprob).. (if unspecified, then it is 'dialog' for child windows)"> # the name or the class can be set, or both. this is used to match # windows when they appear. role can optionally be set as well, to
M
openbox/event.c
→
openbox/event.c
@@ -1926,8 +1926,7 @@ if (ev->xcrossing.detail == NotifyInferior)
break; if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) && - (f = find_active_menu()) && f->selected == e && - e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU) + (f = find_active_menu()) && f->selected == e) { ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root, ev->xcrossing.y_root);
M
tools/obprop/obprop.c
→
tools/obxprop/obxprop.c
@@ -12,7 +12,7 @@ fprintf(stderr, "%s\n", s);
else fprintf (stderr, - "Usage: obprop [OPTIONS]\n\n" + "Usage: obxprop [OPTIONS]\n\n" "Options:\n" " --help Display this help and exit\n" " --display DISPLAY Connect to this X display\n"