mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-20 21:08:08 +01:00
Fix compilation from merge conflict
This commit is contained in:
@@ -94,7 +94,7 @@ static void createPanel(Panel * p)
|
||||
{
|
||||
_Panel *panel = (_Panel *) p;
|
||||
WMScreen *scr = WMWidgetScreen(panel->parent);
|
||||
WMPixmap *icon1, *icon2;
|
||||
WMPixmap *icon1;
|
||||
RImage *xis = NULL;
|
||||
RContext *rc = WMScreenRContext(scr);
|
||||
char *path;
|
||||
|
||||
@@ -4509,7 +4509,7 @@ static void swapDrawer(WDock *drawer, int new_x)
|
||||
|
||||
/* Update drawer's tile */
|
||||
if (i == 0) {
|
||||
wIconUpdate(ai->icon, NULL);
|
||||
wIconUpdate(ai->icon);
|
||||
wDrawerIconPaint(ai);
|
||||
}
|
||||
XMoveWindow(dpy, ai->icon->core->window, ai->x_pos, ai->y_pos);
|
||||
|
||||
Reference in New Issue
Block a user