gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 13:28:05 +01:00
Code Issues Projects Releases Wiki Activity

Fix compilation from merge conflict

Browse Source
This commit is contained in:
Carlos R. Mafra
2013-04-12 02:20:54 +01:00
parent 529ee0bd21
commit 311255a646
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WPrefs.app/Workspace.c
View File

@@ -94,7 +94,7 @@ static void createPanel(Panel * p)
{ {
_Panel *panel = (_Panel *) p; _Panel *panel = (_Panel *) p;
WMScreen *scr = WMWidgetScreen(panel->parent); WMScreen *scr = WMWidgetScreen(panel->parent);
WMPixmap *icon1, *icon2; WMPixmap *icon1;
RImage *xis = NULL; RImage *xis = NULL;
RContext *rc = WMScreenRContext(scr); RContext *rc = WMScreenRContext(scr);
char *path; char *path;

2
src/dock.c
View File

@@ -4509,7 +4509,7 @@ static void swapDrawer(WDock *drawer, int new_x)
/* Update drawer's tile */ /* Update drawer's tile */
if (i == 0) { if (i == 0) {
wIconUpdate(ai->icon, NULL); wIconUpdate(ai->icon);
wDrawerIconPaint(ai); wDrawerIconPaint(ai);
} }
XMoveWindow(dpy, ai->icon->core->window, ai->x_pos, ai->y_pos); XMoveWindow(dpy, ai->icon->core->window, ai->x_pos, ai->y_pos);