This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
discards c54d29464894050927854a2ee7b2495ea86de7fa (commit)
discards dc0062f37a818fc708a85e43ed782b1f16b43e51 (commit)
discards 5301e61945cc472324df0821b61b4b579d551b82 (commit)
discards e90c0d3d754fd1665c213423b61cd0de2b63e923 (commit)
discards 4a2c07c36521eed4e1be96abb2fab93dd3d20265 (commit)
via d9e3409c050657d3d57ce63e7bc31d0f9565ff46 (commit)
via e3f8f27e0816127fc36e966f641ced755da5b9f8 (commit)
via 64648f9a7fe6e61a587f0812f0090923321bb1fe (commit)
via 1193d0faf5b05a533542747cb6330d9a63435464 (commit)
via 761f3c6e8560e4cda644427e9167265be54981f8 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (c54d29464894050927854a2ee7b2495ea86de7fa)
N -- N -- N (d9e3409c050657d3d57ce63e7bc31d0f9565ff46)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/d9e3409c050657d3d57ce63e7bc31d0f9565ff46
commit d9e3409c050657d3d57ce63e7bc31d0f9565ff46
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 21:31:26 2014 +0100
WINGS: removed compiler warnings.
This patch removes compiler warnings.
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 26ca1fcb..29777027 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -340,7 +340,6 @@ static void colorListPaintItem(WMList * lPtr, int index,
Drawable d, char *text,
static void colorListSelect(WMWidget * w, void *data);
static void colorListColorMenuCallback(WMWidget * w, void *data);
static void colorListListMenuCallback(WMWidget * w, void *data);
-static void colorListListMenuNew(W_ColorPanel * panel);
static void wheelInit(W_ColorPanel * panel);
static void grayInit(W_ColorPanel * panel);
@@ -3238,8 +3237,6 @@ static void colorListListMenuCallback(WMWidget * w, void
*data)
switch (item) {
case CLmenuAdd:
- /* New Color List */
- colorListListMenuNew(panel);
break;
case CLmenuRename:
break;
@@ -3248,11 +3245,6 @@ static void colorListListMenuCallback(WMWidget * w, void
*data)
}
}
-static void colorListListMenuNew(W_ColorPanel * panel)
-{
-
-}
-
/*************** Panel Initialisation Functions *****************/
static void wheelInit(W_ColorPanel * panel)
diff --git a/WINGs/wcolorwell.c b/WINGs/wcolorwell.c
index a4b94ff5..ace85cd0 100644
--- a/WINGs/wcolorwell.c
+++ b/WINGs/wcolorwell.c
@@ -111,21 +111,6 @@ static void updateColorCallback(void *self, void *data)
WMPostNotificationName(WMColorWellDidChangeNotification, cPtr, NULL);
}
-static void activatedObserver(void *data, WMNotification * notification)
-{
- /*
- WMColorWell *cPtr = (WMColorWell*)data;
-
- if (!cPtr->flags.active || WMGetNotificationObject(notification) ==
cPtr)
- return;
-
- W_SetViewBackgroundColor(cPtr->view, WMWidgetScreen(cPtr)->gray);
- paintColorWell(cPtr);
-
- cPtr->flags.active = 0;
- */
-}
-
static WMArray *getXdndTypeArray(void)
{
WMArray *types = WMCreateArray(1);
@@ -173,8 +158,6 @@ WMColorWell *WMCreateColorWell(WMWidget * parent)
W_ResizeView(cPtr->view, DEFAULT_WIDTH, DEFAULT_HEIGHT);
- WMAddNotificationObserver(activatedObserver, cPtr,
_ColorWellActivatedNotification, NULL);
-
cPtr->color = WMBlackColor(WMWidgetScreen(cPtr));
WMAddNotificationObserver(colorChangedObserver, cPtr,
WMColorPanelColorChangedNotification, NULL);
diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c
index 10eea336..6dc8babb 100644
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -470,11 +470,6 @@ static char *get_name_from_path(const char *path)
return wstrdup(&(path[size]));
}
-static Bool filterFileName(WMFilePanel * panel, const char *file, Bool
isDirectory)
-{
- return True;
-}
-
#define CAST(item) (*((WMListItem**)item))
static int comparer(const void *a, const void *b)
{
@@ -535,9 +530,7 @@ static void listDirectoryOnColumn(WMFilePanel * panel, int
column, const char *p
int isDirectory;
isDirectory = S_ISDIR(stat_buf.st_mode);
-
- if (filterFileName(panel, dentry->d_name, isDirectory))
- WMInsertBrowserItem(bPtr, column, -1,
dentry->d_name, isDirectory);
+ WMInsertBrowserItem(bPtr, column, -1, dentry->d_name,
isDirectory);
}
}
WMSortBrowserColumnWithComparer(bPtr, column, comparer);
@@ -738,6 +731,9 @@ out:
static void goUnmount(WMWidget *widget, void *p_panel)
{
+ /* Not implemented yet */
+ (void) widget;
+ (void) p_panel;
}
static void goFloppy(WMWidget *widget, void *p_panel)
diff --git a/WINGs/wprogressindicator.c b/WINGs/wprogressindicator.c
index 374df5e0..61b4e2e7 100644
--- a/WINGs/wprogressindicator.c
+++ b/WINGs/wprogressindicator.c
@@ -141,6 +141,8 @@ static void didResizeProgressIndicator(W_ViewDelegate *
self, WMView * view)
/* Parameter not used, but tell the compiler that it is ok */
(void) self;
+ (void) width;
+ (void) height;
assert(width > 0);
assert(height > 0);
diff --git a/WINGs/wsplitview.c b/WINGs/wsplitview.c
index 38b2cb39..60d86015 100644
--- a/WINGs/wsplitview.c
+++ b/WINGs/wsplitview.c
@@ -775,10 +775,12 @@ void WMSetSplitViewVertical(WMSplitView * sPtr, Bool flag)
*/
}
-int WMGetSplitViewDividerThickness(WMSplitView * sPtr)
+int WMGetSplitViewDividerThickness(WMSplitView *sPtr)
{
CHECK_CLASS(sPtr, WC_SplitView);
+ (void) sPtr;
+
return (DIVIDER_THICKNESS);
}
http://repo.or.cz/w/wmaker-crm.git/commit/e3f8f27e0816127fc36e966f641ced755da5b9f8
commit e3f8f27e0816127fc36e966f641ced755da5b9f8
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:55:32 2014 +0100
remove wtest compiler warnings.
This patch removes the wtest compiler warnings.
diff --git a/test/wtest.c b/test/wtest.c
index 8490e9ca..c886c5b9 100644
--- a/test/wtest.c
+++ b/test/wtest.c
@@ -29,18 +29,24 @@ Display *dpy;
Window leader;
WMAppContext *app;
-static void callback(void *foo, int item, Time time)
+static void callback(int item)
{
+ (void) item;
+
printf("pushed item %in", item);
}
-static void quit(void *foo, int item, Time time)
+static void quit(int item)
{
+ (void) item;
+
exit(0);
}
-static void hide(void *foo, int item, Time time)
+static void hide(int item)
{
+ (void) item;
+
WMHideApplication(app);
}
@@ -52,11 +58,12 @@ WMMenu *menu;
WMMenu *submenu;
int wincount = 0;
-static void newwin(void *foo, int item, Time time)
+static void newwin(int item)
{
Window win;
XClassHint classhint;
char title[100];
+ (void) item;
wincount++;
win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10 * wincount,
10 * wincount, 200, 100, 0, 0, 0);
@@ -76,10 +83,6 @@ static void newwin(void *foo, int item, Time time)
attr.miniaturize_pixmap = XCreateBitmapFromData(dpy,
DefaultRootWindow(dpy), bits, 10, 10);
attr.miniaturize_mask = XCreateBitmapFromData(dpy,
DefaultRootWindow(dpy), mbits, 10, 10);
- /*
- attr.flags |= GSWindowStyleAttr;
- attr.window_style = NSTitledWindowMask|NSClosableWindowMask;
- */
WMSetWindowAttributes(dpy, win, &attr);
@@ -106,6 +109,7 @@ int main(int argc, char **argv)
miniaturize_win = XInternAtom(dpy, "_GNUSTEP_WM_MINIATURIZE_WINDOW",
False);
leader = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, 10,
10, 0, 0, 0);
+
/* set class hint */
classhint.res_name = "test";
classhint.res_class = "Test";
@@ -138,7 +142,7 @@ int main(int argc, char **argv)
XSetCommand(dpy, leader, argv, argc);
/* create first window */
- newwin(NULL, 0, 0);
+ newwin(0);
XFlush(dpy);
puts("Run xprop on the test window to see the properties defined");
http://repo.or.cz/w/wmaker-crm.git/commit/64648f9a7fe6e61a587f0812f0090923321bb1fe
commit 64648f9a7fe6e61a587f0812f0090923321bb1fe
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:08:03 2014 +0100
Removed unused code in screen.c
This patch removes the unused code in screen.c.
The variable "dock_head", is defined, but not used. When we removes
the variable, then we can see that a lot of code is not used! so we
can remove it :-)
This patch also removes some extra curly brackets and join the variable
definition and the initialization in one line for some variables.
diff --git a/src/screen.c b/src/screen.c
index 3735fc04..1511876f 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -673,7 +673,7 @@ WScreen *wScreenInit(int screen_number)
return scr;
}
-void wScreenUpdateUsableArea(WScreen * scr)
+void wScreenUpdateUsableArea(WScreen *scr)
{
/*
* scr->totalUsableArea[] will become the usableArea used for
Windowplacement,
@@ -682,23 +682,10 @@ void wScreenUpdateUsableArea(WScreen * scr)
*/
WArea area;
- int i, dock_head;
- unsigned long best_area, tmp_area;
- unsigned int size, position;
-
- dock_head = scr->xine_info.primary_head;
- best_area = 0;
- size = wPreferences.workspace_border_size;
- position = wPreferences.workspace_border_position;
-
- if (scr->dock) {
- WMRect rect;
- rect.pos.x = scr->dock->x_pos;
- rect.pos.y = scr->dock->y_pos;
- rect.size.width = wPreferences.icon_size;
- rect.size.height = wPreferences.icon_size;
- dock_head = wGetHeadForRect(scr, rect);
- }
+ int i;
+ unsigned long tmp_area, best_area = 0;
+ unsigned int size = wPreferences.workspace_border_size;
+ unsigned int position = wPreferences.workspace_border_position;
for (i = 0; i < wXineramaHeads(scr); ++i) {
WMRect rect = wGetRectForHead(scr, i);
@@ -716,23 +703,17 @@ void wScreenUpdateUsableArea(WScreen * scr)
scr->usableArea[i] = scr->totalUsableArea[i];
-#if 0
- printf("usableArea[%d]: %d %d %d %dn", i,
- scr->usableArea[i].x1, scr->usableArea[i].x2,
scr->usableArea[i].y1, scr->usableArea[i].y2);
-#endif
if (wPreferences.no_window_over_icons) {
if (wPreferences.icon_yard & IY_VERT) {
- if (wPreferences.icon_yard & IY_RIGHT) {
+ if (wPreferences.icon_yard & IY_RIGHT)
scr->totalUsableArea[i].x2 -=
wPreferences.icon_size;
- } else {
+ else
scr->totalUsableArea[i].x1 +=
wPreferences.icon_size;
- }
} else {
- if (wPreferences.icon_yard & IY_TOP) {
+ if (wPreferences.icon_yard & IY_TOP)
scr->totalUsableArea[i].y1 +=
wPreferences.icon_size;
- } else {
+ else
scr->totalUsableArea[i].y2 -=
wPreferences.icon_size;
- }
}
}
http://repo.or.cz/w/wmaker-crm.git/commit/1193d0faf5b05a533542747cb6330d9a63435464
commit 1193d0faf5b05a533542747cb6330d9a63435464
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:08:02 2014 +0100
Removed compiler warnings in dock.c
This patch removes the compiler warnings for unused variables in the
file dock.c
diff --git a/src/dock.c b/src/dock.c
index 222627f9..ef3611f2 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -121,7 +121,7 @@ static void removeDrawerCallback(WMenu *menu, WMenuEntry
*entry);
static void drawerAppendToChain(WScreen *scr, WDock *drawer);
static char *findUniqueName(WScreen *scr, const char *instance_basename);
static void addADrawerCallback(WMenu *menu, WMenuEntry *entry);
-static void swapDrawers(WScreen *scr, int on_right_side, int new_x);
+static void swapDrawers(WScreen *scr, int new_x);
static WDock* getDrawer(WScreen *scr, int y_index);
static int indexOfHole(WDock *drawer, WAppIcon *moving_aicon, int redocking);
static void drawerConsolidateIcons(WDock *drawer);
@@ -3015,7 +3015,7 @@ static void swapDock(WDock *dock)
else
x = dock->x_pos = DOCK_EXTRA_SPACE;
- swapDrawers(scr, dock->on_right_side, x);
+ swapDrawers(scr, x);
for (i = 0; i < dock->max_icons; i++) {
btn = dock->icon_array[i];
@@ -4031,6 +4031,9 @@ static void clipEnterNotify(WObjDescriptor *desc, XEvent
*event)
WDock *dock, *tmp;
WScreen *scr;
+ /* Parameter not used, but tell the compiler that it is ok */
+ (void) event;
+
assert(event->type == EnterNotify);
if (desc->parent_type != WCLASS_DOCK_ICON)
@@ -4111,6 +4114,9 @@ static void clipLeaveNotify(WObjDescriptor *desc, XEvent
*event)
{
WAppIcon *btn = (WAppIcon *) desc->parent;
+ /* Parameter not used, but tell the compiler that it is ok */
+ (void) event;
+
assert(event->type == LeaveNotify);
if (desc->parent_type != WCLASS_DOCK_ICON)
@@ -4567,13 +4573,13 @@ static void swapDrawer(WDock *drawer, int new_x)
}
-static void swapDrawers(WScreen *scr, int on_right_side, int new_x)
+static void swapDrawers(WScreen *scr, int new_x)
{
WDrawerChain *dc;
- if (scr->drawer_tile) {
+ if (scr->drawer_tile)
RReleaseImage(scr->drawer_tile);
- }
+
scr->drawer_tile = wDrawerMakeTile(scr, scr->icon_tile);
for (dc = scr->drawers; dc != NULL; dc = dc->next) {
http://repo.or.cz/w/wmaker-crm.git/commit/761f3c6e8560e4cda644427e9167265be54981f8
commit 761f3c6e8560e4cda644427e9167265be54981f8
Author: Rodolfo García Peñas (kix) <[email protected]>
Date: Fri Jan 31 20:08:01 2014 +0100
Remove compiler warnings in defaults.c
This patch removes these warnings:
defaults.c: In function ‘getFont’:
defaults.c:2011:84: warning: unused parameter ‘addr’ [-Wunused-parameter]
static int getFont(WScreen * scr, WDefaultEntry * entry, WMPropList *
value, void *addr, void **ret)
^
defaults.c: In function ‘getColor’:
defaults.c:2036:85: warning: unused parameter ‘addr’ [-Wunused-parameter]
static int getColor(WScreen * scr, WDefaultEntry * entry, WMPropList *
value, void *addr, void **ret)
diff --git a/src/defaults.c b/src/defaults.c
index 5bf82672..c5fd853c 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2032,6 +2032,8 @@ static int getFont(WScreen * scr, WDefaultEntry * entry,
WMPropList * value, voi
static WMFont *font;
const char *val;
+ (void) addr;
+
GET_STRING_OR_DEFAULT("Font", val);
font = WMCreateFont(scr->wmscreen, val);
@@ -2058,6 +2060,8 @@ static int getColor(WScreen * scr, WDefaultEntry * entry,
WMPropList * value, vo
const char *val;
int second_pass = 0;
+ (void) addr;
+
GET_STRING_OR_DEFAULT("Color", val);
again:
-----------------------------------------------------------------------
Summary of changes:
WINGs/wcolorpanel.c | 8 --------
WINGs/wcolorwell.c | 17 -----------------
WINGs/wfilepanel.c | 12 ++++--------
WINGs/wprogressindicator.c | 2 ++
WINGs/wsplitview.c | 4 +++-
WPrefs.app/Expert.c | 2 +-
6 files changed, 10 insertions(+), 35 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
