projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c12d09b
)
Fix shadowed variables
author
Mikael Magnusson
<mikachu@comhem.se>
Tue, 4 Sep 2007 04:22:28 +0000
(06:22 +0200)
committer
Mikael Magnusson
<mikachu@comhem.se>
Tue, 4 Sep 2007 04:25:06 +0000
(06:25 +0200)
openbox/client_list_combined_menu.c
patch
|
blob
|
history
openbox/client_list_menu.c
patch
|
blob
|
history
openbox/config.c
patch
|
blob
|
history
openbox/mainloop.c
patch
|
blob
|
history
openbox/menuframe.c
patch
|
blob
|
history
openbox/mouse.c
patch
|
blob
|
history
openbox/place.c
patch
|
blob
|
history
openbox/stacking.c
patch
|
blob
|
history
render/font.c
patch
|
blob
|
history
diff --git
a/openbox/client_list_combined_menu.c
b/openbox/client_list_combined_menu.c
index
bb49219
..
194c927
100644
(file)
--- a/
openbox/client_list_combined_menu.c
+++ b/
openbox/client_list_combined_menu.c
@@
-82,8
+82,6
@@
static gboolean self_update(ObMenuFrame *frame, gpointer data)
}
if (empty || onlyiconic) {
}
if (empty || onlyiconic) {
- ObMenuEntry *e;
-
/* no entries or only iconified windows, so add a
* way to go to this desktop without uniconifying a window */
if (!empty)
/* no entries or only iconified windows, so add a
* way to go to this desktop without uniconifying a window */
if (!empty)
diff --git
a/openbox/client_list_menu.c
b/openbox/client_list_menu.c
index
5f6a832
..
33f4b6f
100644
(file)
--- a/
openbox/client_list_menu.c
+++ b/
openbox/client_list_menu.c
@@
-137,10
+137,10
@@
static gboolean self_update(ObMenuFrame *frame, gpointer data)
for (i = 0; i < screen_num_desktops; ++i) {
ObMenu *submenu;
gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
for (i = 0; i < screen_num_desktops; ++i) {
ObMenu *submenu;
gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
- DesktopData *data = g_new(DesktopData, 1);
+ DesktopData *d
d
ata = g_new(DesktopData, 1);
- data->desktop = i;
- submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
+ d
d
ata->desktop = i;
+ submenu = menu_new(name, screen_desktop_names[i], FALSE, d
d
ata);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);
diff --git
a/openbox/config.c
b/openbox/config.c
index
1bf63e5
..
cd38d7b
100644
(file)
--- a/
openbox/config.c
+++ b/
openbox/config.c
@@
-174,8
+174,8
@@
void config_app_settings_copy_non_defaults(const ObAppSettings *src,
the monitor, so <position><x>center</x></position><monitor>2</monitor>
will center the window on the second monitor.
*/
the monitor, so <position><x>center</x></position><monitor>2</monitor>
will center the window on the second monitor.
*/
-static void parse_per_app_settings(ObParseInst *i, xmlDocPtr doc,
- xmlNodePtr node, gpointer d)
+static void parse_per_app_settings(ObParseInst *i
nst
, xmlDocPtr doc,
+ xmlNodePtr node, gpointer d
ata
)
{
xmlNodePtr app = parse_find_node("application", node->children);
gchar *name = NULL, *class = NULL, *role = NULL;
{
xmlNodePtr app = parse_find_node("application", node->children);
gchar *name = NULL, *class = NULL, *role = NULL;
@@
-379,7
+379,7
@@
static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
gchar *key;
{
xmlNodePtr n;
gchar *key;
@@
-411,7
+411,7
@@
static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
*/
static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
*/
static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n, nbut, nact;
gchar *buttonstr;
{
xmlNodePtr n, nbut, nact;
gchar *buttonstr;
@@
-468,7
+468,7
@@
static void parse_mouse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
@@
-489,7
+489,7
@@
static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
@@
-503,7
+503,7
@@
static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
@@
-520,7
+520,7
@@
static void parse_margins(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
@@
-603,7
+603,7
@@
static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
@@
-640,7
+640,7
@@
static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
@@
-667,7
+667,7
@@
static void parse_resize(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
@@
-744,7
+744,7
@@
static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
for (node = node->children; node; node = node->next) {
{
xmlNodePtr n;
for (node = node->children; node; node = node->next) {
@@
-768,7
+768,7
@@
static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
}
static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
- gpointer d)
+ gpointer d
ata
)
{
xmlNodePtr n;
{
xmlNodePtr n;
diff --git
a/openbox/mainloop.c
b/openbox/mainloop.c
index
591a715
..
7c6a956
100644
(file)
--- a/
openbox/mainloop.c
+++ b/
openbox/mainloop.c
@@
-216,8
+216,6
@@
void ob_main_loop_destroy(ObMainLoop *loop)
/* only do this if we're the last loop destroyed */
if (!all_loops) {
/* only do this if we're the last loop destroyed */
if (!all_loops) {
- guint i;
-
/* grab all the signals that cause core dumps */
for (i = 0; i < NUM_CORE_SIGNALS; ++i) {
if (all_signals[core_signals[i]].installed) {
/* grab all the signals that cause core dumps */
for (i = 0; i < NUM_CORE_SIGNALS; ++i) {
if (all_signals[core_signals[i]].installed) {
diff --git
a/openbox/menuframe.c
b/openbox/menuframe.c
index
2c666e3
..
944fa2e
100644
(file)
--- a/
openbox/menuframe.c
+++ b/
openbox/menuframe.c
@@
-637,9
+637,9
@@
void menu_frame_render(ObMenuFrame *self)
STRUT_SET(self->item_margin, 0, 0, 0, 0);
if (self->entries) {
STRUT_SET(self->item_margin, 0, 0, 0, 0);
if (self->entries) {
- ObMenuEntryFrame *e = self->entries->data;
gint l, t, r, b;
gint l, t, r, b;
+ e = self->entries->data;
e->a_text_normal->texture[0].data.text.string = "";
tw = RrMinWidth(e->a_text_normal);
tw += 2*PADDING;
e->a_text_normal->texture[0].data.text.string = "";
tw = RrMinWidth(e->a_text_normal);
tw += 2*PADDING;
diff --git
a/openbox/mouse.c
b/openbox/mouse.c
index
9761609
..
dbd4869
100644
(file)
--- a/
openbox/mouse.c
+++ b/
openbox/mouse.c
@@
-153,10
+153,10
@@
void mouse_unbind_all()
gint j;
for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
gint j;
for (j = 0; j < OB_NUM_MOUSE_ACTIONS; ++j) {
- GSList *
i
t;
+ GSList *
j
t;
- for (
it = b->actions[j]; it; it = g_slist_next(i
t))
- actions_act_unref(
i
t->data);
+ for (
jt = b->actions[j]; jt; jt = g_slist_next(j
t))
+ actions_act_unref(
j
t->data);
g_slist_free(b->actions[j]);
}
g_free(b);
g_slist_free(b->actions[j]);
}
g_free(b);
diff --git
a/openbox/place.c
b/openbox/place.c
index
851e4f8
..
aa572db
100644
(file)
--- a/
openbox/place.c
+++ b/
openbox/place.c
@@
-254,8
+254,6
@@
static gboolean place_nooverlap(ObClient *c, gint *x, gint *y)
/* try ignoring different things to find empty space */
for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
/* try ignoring different things to find empty space */
for (ignore = 0; ignore < IGNORE_END && !ret; ignore++) {
- guint i;
-
/* try all monitors in order of preference */
for (i = 0; i < screen_num_monitors && !ret; ++i) {
GList *it;
/* try all monitors in order of preference */
for (i = 0; i < screen_num_monitors && !ret; ++i) {
GList *it;
diff --git
a/openbox/stacking.c
b/openbox/stacking.c
index
2280b87
..
2a0d585
100644
(file)
--- a/
openbox/stacking.c
+++ b/
openbox/stacking.c
@@
-411,6
+411,7
@@
void stacking_add_nonintrusive(ObWindow *win)
ObClient *client;
GList *it_below = NULL; /* this client will be below us */
GList *it_above;
ObClient *client;
GList *it_below = NULL; /* this client will be below us */
GList *it_above;
+ GList *wins;
if (!WINDOW_IS_CLIENT(win)) {
stacking_add(win); /* no special rules for others */
if (!WINDOW_IS_CLIENT(win)) {
stacking_add(win); /* no special rules for others */
@@
-468,7
+469,7
@@
void stacking_add_nonintrusive(ObWindow *win)
break;
}
break;
}
-
GList *
wins = g_list_append(NULL, win);
+ wins = g_list_append(NULL, win);
do_restack(wins, it_below);
g_list_free(wins);
}
do_restack(wins, it_below);
g_list_free(wins);
}
diff --git
a/render/font.c
b/render/font.c
index
8d389d8
..
356b9c6
100644
(file)
--- a/
render/font.c
+++ b/
render/font.c
@@
-278,11
+278,11
@@
void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area)
c.pixel = t->color->pixel;
if (t->shortcut) {
c.pixel = t->color->pixel;
if (t->shortcut) {
- const gchar *
c
= t->string + t->shortcut_pos;
+ const gchar *
s
= t->string + t->shortcut_pos;
t->font->shortcut_underline->start_index = t->shortcut_pos;
t->font->shortcut_underline->end_index = t->shortcut_pos +
t->font->shortcut_underline->start_index = t->shortcut_pos;
t->font->shortcut_underline->end_index = t->shortcut_pos +
- (g_utf8_next_char(
c) - c
);
+ (g_utf8_next_char(
s) - s
);
/* the attributes are owned by the layout.
re-add the attributes to the layout after changing the
/* the attributes are owned by the layout.
re-add the attributes to the layout after changing the