Attachment 312715 Details for Bug 454208 – florence-0.2.2-warnings.patch

[patch] florence-0.2.2-warnings.patch

florence-0.2.2-warnings.patch (text/plain), 3.94 KB, created by Robert Scheck on 2008-07-26 20:25:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Scheck

Created: 2008-07-26 20:25:29 UTC

Size: 3.94 KB

patch

obsolete

>Patch by Robert Scheck <robert@fedoraproject.org> for florence <= 0.2.2, which removes
>several warnings e.g. for implicit declarations and unused variables. If possible, this
>patch should be sent to upstream for reviewing and for possible inclusion into the next
>upstream release.
>
>--- florence-0.2.2/src/florence.c			2008-05-29 21:19:58.000000000 +0200
>+++ florence-0.2.2/src/florence.c.warnings		2008-07-26 20:58:16.000000000 +0200
>@@ -145,12 +145,10 @@
> {
> 	GSList *list;
> 	struct extension *extension;
>-	struct keyboard *keyboard;
> 	guint y, xoffset=0, yoffset=0;
> 	GdkBitmap *mask=NULL;
> 	guint width;
> 	guchar *data=NULL;
>-	guchar byte;
> 
> 	if (shape) {
> 		width=(flo_width&0xFFFFFFF8)+(flo_width&0x7?8:0);
>--- florence-0.2.2/src/keyboard.c			2008-05-29 21:19:58.000000000 +0200
>+++ florence-0.2.2/src/keyboard.c.warnings		2008-07-26 20:58:38.000000000 +0200
>@@ -24,6 +24,7 @@
> #include <X11/XKBlib.h>
> #include <glib.h>
> #include <gtk/gtk.h>
>+#include <gdk/gdkx.h>
> #include <cspi/spi.h>
> #include <gconf/gconf-client.h>
> #include "system.h"
>@@ -31,6 +32,7 @@
> #include "keyboard.h"
> #include "key.h"
> #include "settings.h"
>+#include "layoutreader.h"
> 
> /* Determines the frame/sec used to animate click timer */
> /* 20 ms means 1/0.02=50 fps */
>@@ -237,7 +239,6 @@
> 	GnomeCanvasClipgroup *group;
> 	GdkModifierType mod;
> 	XkbStateRec rec;
>-	XkbDescPtr xkb;
> 	gboolean locker;
> 
> 	flo_debug("[new key] code=%d x=%f y=%f w=%f h=%f shape=%s", code, x, y, w, h, shape);
>@@ -360,7 +361,6 @@
> {
> 	struct keyboard *keyboard=NULL;
> 	gdouble click_time;
>-	guint i;
> 	int maj = XkbMajorVersion;
> 	int min = XkbMinorVersion;
> 	int opcode_rtrn, event_rtrn, error_rtrn;
>--- florence-0.2.2/src/key.c				2008-05-29 21:19:58.000000000 +0200
>+++ florence-0.2.2/src/key.c.warnings			2008-07-26 21:25:01.000000000 +0200
>@@ -25,8 +25,8 @@
> #include "keyboard.h"
> #include <math.h>
> #include <string.h>
>-#include <libart_lgpl/art_bpath.h>
>-#include <libart_lgpl/art_vpath.h>
>+#include <libart_lgpl/art_vpath_bpath.h>
>+#include <libart_lgpl/art_svp_vpath.h>
> #include <libart_lgpl/art_svp_render_aa.h>
> 
> #define PI 3.1415926535897931
>@@ -164,7 +164,6 @@
> void key_draw(struct key *key, double w, double h, GdkModifierType mod)
> {
> 	double matrix[6]; /* affine matrix */
>-	GnomeCanvasItem **br=NULL;
> 
> 	key->width=w;
> 	key->height=h;
>--- florence-0.2.2/src/settings.c			2008-05-29 21:19:58.000000000 +0200
>+++ florence-0.2.2/src/settings.c.warnings		2008-07-26 21:15:18.000000000 +0200
>@@ -24,6 +24,7 @@
> #include <glade/glade.h>
> #include "system.h"
> #include "settings.h"
>+#include "trace.h"
> #ifdef ENABLE_HELP
> #include <libgnome/gnome-help.h>
> #include <gdk/gdkkeysyms.h>
>--- florence-0.2.2/src/style.c				2008-05-29 21:19:58.000000000 +0200
>+++ florence-0.2.2/src/style.c.warnings			2008-07-26 20:54:53.000000000 +0200
>@@ -22,6 +22,7 @@
> #include <system.h>
> #include "style.h"
> #include "settings.h"
>+#include "trace.h"
> #include "layoutreader.h"
> 
> /* simplified GnomeCanvasLine */
>--- florence-0.2.2/src/trayicon.c			2008-05-29 21:19:58.000000000 +0200
>+++ florence-0.2.2/src/trayicon.c.warnings		2008-07-26 21:15:54.000000000 +0200
>@@ -22,6 +22,7 @@
> #include "system.h"
> #include "config.h"
> #include "settings.h"
>+#include "trace.h"
> #include <gtk/gtk.h>
> #include <gdk-pixbuf/gdk-pixbuf.h>
> #ifdef ENABLE_HELP
>--- florence-0.2.2/src/layoutreader.c			2008-05-29 21:19:58.000000000 +0200
>+++ florence-0.2.2/src/layoutreader.c.warnings		2008-07-26 22:16:51.000000000 +0200
>@@ -21,6 +21,7 @@
> 
> #include "system.h"
> #include "layoutreader.h"
>+#include "trace.h"
> #include <glib.h>
> 
> #ifndef LIBXML_READER_ENABLED
>@@ -266,7 +267,6 @@
> {
> 	xmlChar *name=NULL;
> 	xmlChar *label=NULL;
>-	xmlChar *nodename=NULL;
> 	name=layoutreader_readstring(reader, "name", 3);
> 	label=layoutreader_readstring(reader, "label", 3);
> 	symfunc(reader, name, label, userdata);
>@@ -321,7 +321,6 @@
> {
> 	xmlChar *name, *buffer;
> 	enum layout_placement placement;
>-	int order;
> 	int ret=FALSE;
> 
> 	if (layoutreader_goto(reader, "extension", XML_READER_TYPE_ELEMENT, 1))

Actions: View | Diff

Attachments on bug 454208: 312715