nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename the res_name and res_class members to name and class

Browse source
This commit is contained in:
Dana Jansens 2003-03-22 00:35:02 +00:00
parent ba1e06157d
commit dd6e27f2c3
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
openbox/client.c
View file

@ -300,8 +300,8 @@ void client_unmanage(Client *client)
g_free(client->icons); g_free(client->icons);
g_free(client->title); g_free(client->title);
g_free(client->icon_title); g_free(client->icon_title);
g_free(client->res_name); g_free(client->name);
g_free(client->res_class); g_free(client->class);
g_free(client->role); g_free(client->role);
g_free(client); g_free(client);
@ -384,7 +384,7 @@ static void client_get_all(Client *self)
/* defaults */ /* defaults */
self->frame = NULL; self->frame = NULL;
self->title = self->icon_title = NULL; self->title = self->icon_title = NULL;
self->res_name = self->res_class = self->role = NULL; self->name = self->class = self->role = NULL;
self->wmstate = NormalState; self->wmstate = NormalState;
self->transient = FALSE; self->transient = FALSE;
self->transients = NULL; self->transients = NULL;
@ -1013,19 +1013,19 @@ void client_update_class(Client *self)
gchar *s; gchar *s;
guint i; guint i;
if (self->res_name) g_free(self->res_name); if (self->name) g_free(self->name);
if (self->res_class) g_free(self->res_class); if (self->class) g_free(self->class);
if (self->role) g_free(self->role); if (self->role) g_free(self->role);
self->res_name = self->res_class = self->role = NULL; self->name = self->class = self->role = NULL;
data = g_ptr_array_new(); data = g_ptr_array_new();
if (PROP_GETSA(self->window, wm_class, string, data)) { if (PROP_GETSA(self->window, wm_class, string, data)) {
if (data->len > 0) if (data->len > 0)
self->res_name = g_strdup(g_ptr_array_index(data, 0)); self->name = g_strdup(g_ptr_array_index(data, 0));
if (data->len > 1) if (data->len > 1)
self->res_class = g_strdup(g_ptr_array_index(data, 1)); self->class = g_strdup(g_ptr_array_index(data, 1));
} }
for (i = 0; i < data->len; ++i) for (i = 0; i < data->len; ++i)
@ -1035,8 +1035,8 @@ void client_update_class(Client *self)
if (PROP_GETS(self->window, wm_window_role, string, s)) if (PROP_GETS(self->window, wm_window_role, string, s))
self->role = g_strdup(s); self->role = g_strdup(s);
if (self->res_name == NULL) self->res_name = g_strdup(""); if (self->name == NULL) self->name = g_strdup("");
if (self->res_class == NULL) self->res_class = g_strdup(""); if (self->class == NULL) self->class = g_strdup("");
if (self->role == NULL) self->role = g_strdup(""); if (self->role == NULL) self->role = g_strdup("");
} }

4
openbox/client.h
View file

@ -132,9 +132,9 @@ typedef struct Client {
gchar *icon_title; gchar *icon_title;
/*! The application that created the window */ /*! The application that created the window */
gchar *res_name; gchar *name;
/*! The class of the window, can used for grouping */ /*! The class of the window, can used for grouping */
gchar *res_class; gchar *class;
/*! The specified role of the window, used for identification */ /*! The specified role of the window, used for identification */
gchar *role; gchar *role;