From: Mikael Magnusson Date: Sun, 11 Aug 2013 17:26:52 +0000 (+0200) Subject: Change "plain" to "exact" for If's X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=7c4fae0312dc7af7578e0fe345cec0a92ea87c9f;p=chaz%2Fopenbox Change "plain" to "exact" for If's <title> --- diff --git a/CHANGELOG b/CHANGELOG index fe81a859..01798fef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,7 +15,7 @@ * Correctly interface with latest gnome-session for Gnome/Openbox X sessions. * Allow third-party control of window opacity in compositing managers. * Improved themeing options. Contributed by Dave Foster. - * Add <monitor>, <title type="regex">, <title type="plain"> and + * Add <monitor>, <title type="regex">, <title type="exact"> and <activedesktop> options to If action. * Addresses bugs #4661, #5506, #5186, #5758, #5410, #5228, #5277, #5731, #5746, #5737, #5419, #5721, #5711, #5385, #5500, #4992, #5443, #5518, diff --git a/openbox/actions/if.c b/openbox/actions/if.c index fd1280d2..3f4c4d64 100644 --- a/openbox/actions/if.c +++ b/openbox/actions/if.c @@ -32,7 +32,7 @@ typedef struct { guint client_monitor; GPatternSpec *matchtitle; GRegex *regextitle; - gchar *plaintitle; + gchar *exacttitle; GSList *thenacts; GSList *elseacts; } Options; @@ -102,8 +102,8 @@ static gpointer setup_func(xmlNodePtr node) o->matchtitle = g_pattern_spec_new(s); } else if (type && !g_ascii_strcasecmp(type, "regex")) { o->regextitle = g_regex_new(s, 0, 0, NULL); - } else if (type && !g_ascii_strcasecmp(type, "plain")) { - o->plaintitle = g_strdup(s); + } else if (type && !g_ascii_strcasecmp(type, "exact")) { + o->exacttitle = g_strdup(s); } g_free(s); } @@ -152,8 +152,8 @@ static void free_func(gpointer options) g_pattern_spec_free(o->matchtitle); if (o->regextitle) g_regex_unref(o->regextitle); - if (o->plaintitle) - g_free(o->plaintitle); + if (o->exacttitle) + g_free(o->exacttitle); g_slice_free(Options, o); } @@ -195,8 +195,8 @@ static gboolean run_func(ObActionsData *data, gpointer options) (g_pattern_match_string(o->matchtitle, c->original_title))) && (!o->regextitle || (g_regex_match(o->regextitle, c->original_title, 0, NULL))) && - (!o->plaintitle || - (!strcmp(o->plaintitle, c->original_title))) && + (!o->exacttitle || + (!strcmp(o->exacttitle, c->original_title))) && (!o->client_monitor || (o->client_monitor == client_monitor(c) + 1))) {