>From 3912322ae9b9251dab397920d63efce28800abb1 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Mon, 12 Apr 2010 11:46:23 +0200
Subject: [PATCH] Add missing initializers
---
WINGs/wcolorpanel.c | 4 ++--
WINGs/wtext.c | 1 +
WPrefs.app/Configurations.c | 2 +-
WPrefs.app/Workspace.c | 2 +-
WPrefs.app/editmenu.c | 6 +++---
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 6a6ebd0..1aa5a57 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -1600,8 +1600,8 @@ static Cursor magnifyGrabPointer(W_ColorPanel * panel)
W_Screen *scr = WMWidgetScreen(panel->win);
Pixmap magPixmap, magPixmap2;
Cursor magCursor;
- XColor fgColor = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue };
- XColor bgColor = { 0, 0xbf00, 0xa000, 0x5000, DoRed | DoGreen | DoBlue
};
+ XColor fgColor = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue, 0 };
+ XColor bgColor = { 0, 0xbf00, 0xa000, 0x5000, DoRed | DoGreen | DoBlue,
0 };
/* Cursor creation stuff */
magPixmap = XCreatePixmapFromBitmapData(scr->display, W_DRAWABLE(scr),
diff --git a/WINGs/wtext.c b/WINGs/wtext.c
index f032ca6..01772c4 100644
--- a/WINGs/wtext.c
+++ b/WINGs/wtext.c
@@ -1759,6 +1759,7 @@ W_ViewDelegate _TextViewDelegate = {
NULL,
textDidResize,
NULL,
+ NULL
};
#define TEXT_BUFFER_INCR 8
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 42ffd64..2baa5fb 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -110,7 +110,7 @@ createImages(WMScreen *scr, RContext *rc, RImage *xis, char
*file,
{
RImage *icon;
char *path;
- RColor gray = { 0xae, 0xaa, 0xae };
+ RColor gray = { 0xae, 0xaa, 0xae, 0 };
*icon1 = NULL;
*icon2 = NULL;
diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index c9569e9..76eaa5e 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -76,7 +76,7 @@ static void
createImages(WMScreen * scr, RContext * rc, RImage * xis, char *file, WMPixmap
** icon1, WMPixmap ** icon2)
{
RImage *icon;
- RColor gray = { 0xae, 0xaa, 0xae };
+ RColor gray = { 0xae, 0xaa, 0xae, 0 };
*icon1 = WMCreatePixmapFromFile(scr, file);
if (!*icon1) {
diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c
index b0f462c..8efab90 100644
--- a/WPrefs.app/editmenu.c
+++ b/WPrefs.app/editmenu.c
@@ -1143,9 +1143,9 @@ static WEditMenu *duplicateMenu(WEditMenu * menu)
static void dragItem(WEditMenu * menu, WEditMenuItem * item, Bool copy)
{
- static XColor black = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue };
- static XColor green = { 0x0045b045, 0x4500, 0xb000, 0x4500, DoRed |
DoGreen | DoBlue };
- static XColor back = { 0, 0xffff, 0xffff, 0xffff, DoRed | DoGreen |
DoBlue };
+ static XColor black = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue, 0 };
+ static XColor green = { 0x0045b045, 0x4500, 0xb000, 0x4500, DoRed |
DoGreen | DoBlue, 0 };
+ static XColor back = { 0, 0xffff, 0xffff, 0xffff, DoRed | DoGreen |
DoBlue, 0 };
Display *dpy = W_VIEW_DISPLAY(menu->view);
WMScreen *scr = W_VIEW_SCREEN(menu->view);
int x, y;
--
1.7.0
--
[-]
mkdir /nonexistentFrom 3912322ae9b9251dab397920d63efce28800abb1 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Mon, 12 Apr 2010 11:46:23 +0200
Subject: [PATCH] Add missing initializers
---
WINGs/wcolorpanel.c | 4 ++--
WINGs/wtext.c | 1 +
WPrefs.app/Configurations.c | 2 +-
WPrefs.app/Workspace.c | 2 +-
WPrefs.app/editmenu.c | 6 +++---
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/WINGs/wcolorpanel.c b/WINGs/wcolorpanel.c
index 6a6ebd0..1aa5a57 100644
--- a/WINGs/wcolorpanel.c
+++ b/WINGs/wcolorpanel.c
@@ -1600,8 +1600,8 @@ static Cursor magnifyGrabPointer(W_ColorPanel * panel)
W_Screen *scr = WMWidgetScreen(panel->win);
Pixmap magPixmap, magPixmap2;
Cursor magCursor;
- XColor fgColor = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue };
- XColor bgColor = { 0, 0xbf00, 0xa000, 0x5000, DoRed | DoGreen | DoBlue };
+ XColor fgColor = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue, 0 };
+ XColor bgColor = { 0, 0xbf00, 0xa000, 0x5000, DoRed | DoGreen | DoBlue, 0 };
/* Cursor creation stuff */
magPixmap = XCreatePixmapFromBitmapData(scr->display, W_DRAWABLE(scr),
diff --git a/WINGs/wtext.c b/WINGs/wtext.c
index f032ca6..01772c4 100644
--- a/WINGs/wtext.c
+++ b/WINGs/wtext.c
@@ -1759,6 +1759,7 @@ W_ViewDelegate _TextViewDelegate = {
NULL,
textDidResize,
NULL,
+ NULL
};
#define TEXT_BUFFER_INCR 8
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 42ffd64..2baa5fb 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -110,7 +110,7 @@ createImages(WMScreen *scr, RContext *rc, RImage *xis, char *file,
{
RImage *icon;
char *path;
- RColor gray = { 0xae, 0xaa, 0xae };
+ RColor gray = { 0xae, 0xaa, 0xae, 0 };
*icon1 = NULL;
*icon2 = NULL;
diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index c9569e9..76eaa5e 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -76,7 +76,7 @@ static void
createImages(WMScreen * scr, RContext * rc, RImage * xis, char *file, WMPixmap ** icon1, WMPixmap ** icon2)
{
RImage *icon;
- RColor gray = { 0xae, 0xaa, 0xae };
+ RColor gray = { 0xae, 0xaa, 0xae, 0 };
*icon1 = WMCreatePixmapFromFile(scr, file);
if (!*icon1) {
diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c
index b0f462c..8efab90 100644
--- a/WPrefs.app/editmenu.c
+++ b/WPrefs.app/editmenu.c
@@ -1143,9 +1143,9 @@ static WEditMenu *duplicateMenu(WEditMenu * menu)
static void dragItem(WEditMenu * menu, WEditMenuItem * item, Bool copy)
{
- static XColor black = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue };
- static XColor green = { 0x0045b045, 0x4500, 0xb000, 0x4500, DoRed | DoGreen | DoBlue };
- static XColor back = { 0, 0xffff, 0xffff, 0xffff, DoRed | DoGreen | DoBlue };
+ static XColor black = { 0, 0, 0, 0, DoRed | DoGreen | DoBlue, 0 };
+ static XColor green = { 0x0045b045, 0x4500, 0xb000, 0x4500, DoRed | DoGreen | DoBlue, 0 };
+ static XColor back = { 0, 0xffff, 0xffff, 0xffff, DoRed | DoGreen | DoBlue, 0 };
Display *dpy = W_VIEW_DISPLAY(menu->view);
WMScreen *scr = W_VIEW_SCREEN(menu->view);
int x, y;
--
1.7.0
