brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome-doc-tools version doesn't need to be so high. disable the entire

Browse Source 
* configure.in: gnome-doc-tools version doesn't need to be so high.
	* src/compositor/compositor-xrender.c: disable the entire file if the
          compositor is disabled.
	* src/core/async-getprop.[ch]: fixes for -Wall
	* src/core/iconcache.c: fixes for -Wall
	* src/core/testasyncgetprop.c: fixes for -Wall
	* src/core/xprops.c: fixes for -Wall


svn path=/trunk/; revision=4045
This commit is contained in:
Thomas James Alexander Thurman 2008-12-01 22:54:57 +00:00
parent e7cef5bbcb
commit 3b1e91342e
8 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-12-01 Thomas Thurman <tthurman@gnome.org>
* configure.in: gnome-doc-tools version doesn't need to be so high.
* src/compositor/compositor-xrender.c: disable the entire file if the
compositor is disabled.
* src/core/async-getprop.[ch]: fixes for -Wall
* src/core/iconcache.c: fixes for -Wall
* src/core/testasyncgetprop.c: fixes for -Wall
* src/core/xprops.c: fixes for -Wall
2008-11-26 Thomas Thurman <tthurman@gnome.org> 2008-11-26 Thomas Thurman <tthurman@gnome.org>
* tools/announce-wrangler.py: linked language codes to po files * tools/announce-wrangler.py: linked language codes to po files

4
configure.in
View File

@ -231,7 +231,7 @@ fi
if test x$have_xcomposite = xyes; then if test x$have_xcomposite = xyes; then
METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage" METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support]) AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
echo "Building with compositing manager" echo "Building with compositing manager"
## force on render also ## force on render also
@ -487,7 +487,7 @@ fi
CFLAGS="$CFLAGS -Wall -Werror -ansi" CFLAGS="$CFLAGS -Wall -Werror -ansi"
# Use gnome-doc-utils: # Use gnome-doc-utils:
GNOME_DOC_INIT([0.9.0]) GNOME_DOC_INIT([0.8.0])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile

5
src/compositor/compositor-xrender.c
View File

@ -26,6 +26,8 @@
#include <config.h> #include <config.h>
#ifdef HAVE_COMPOSITE_EXTENSIONS
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
@ -3071,3 +3073,6 @@ meta_compositor_xrender_new (MetaDisplay *display)
return NULL; return NULL;
#endif #endif
} }
#endif /* HAVE_COMPOSITE_EXTENSIONS */

4
src/core/async-getprop.c
View File

@ -586,7 +586,7 @@ ag_task_get_reply_and_free (AgGetPropertyTask *task,
int *actual_format, int *actual_format,
unsigned long *nitems, unsigned long *nitems,
unsigned long *bytesafter, unsigned long *bytesafter,
char **prop) unsigned char **prop)
{ {
Display *dpy; Display *dpy;
@ -615,7 +615,7 @@ ag_task_get_reply_and_free (AgGetPropertyTask *task,
*nitems = task->n_items; *nitems = task->n_items;
*bytesafter = task->bytes_after; *bytesafter = task->bytes_after;
*prop = task->data; /* pass out ownership of task->data */ *prop = (unsigned char*) task->data; /* pass out ownership of task->data */
SyncHandle (); SyncHandle ();

2
src/core/async-getprop.h
View File

@ -47,7 +47,7 @@ Status ag_task_get_reply_and_free (AgGetPropertyTask *task,
int *actual_format, int *actual_format,
unsigned long *nitems, unsigned long *nitems,
unsigned long *bytesafter, unsigned long *bytesafter,
char **prop); unsigned char **prop);
Bool ag_task_have_reply (AgGetPropertyTask *task); Bool ag_task_have_reply (AgGetPropertyTask *task);
Atom ag_task_get_property (AgGetPropertyTask *task); Atom ag_task_get_property (AgGetPropertyTask *task);

15
src/core/iconcache.c
View File

@ -225,11 +225,12 @@ read_rgb_icon (MetaDisplay *display,
gulong nitems; gulong nitems;
gulong bytes_after; gulong bytes_after;
int result, err; int result, err;
gulong *data; guchar *data;
gulong *best; gulong *best;
int w, h; int w, h;
gulong *best_mini; gulong *best_mini;
int mini_w, mini_h; int mini_w, mini_h;
gulong *data_as_long = (gulong*) data;
meta_error_trap_push_with_return (display); meta_error_trap_push_with_return (display);
type = None; type = None;
@ -239,8 +240,7 @@ read_rgb_icon (MetaDisplay *display,
display->atom__NET_WM_ICON, display->atom__NET_WM_ICON,
0, G_MAXLONG, 0, G_MAXLONG,
False, XA_CARDINAL, &type, &format, &nitems, False, XA_CARDINAL, &type, &format, &nitems,
&bytes_after, ((guchar **)&data)); &bytes_after, &data);
err = meta_error_trap_pop_with_return (display, TRUE); err = meta_error_trap_pop_with_return (display, TRUE);
if (err != Success || if (err != Success ||
@ -253,7 +253,7 @@ read_rgb_icon (MetaDisplay *display,
return FALSE; return FALSE;
} }
if (!find_best_size (data, nitems, if (!find_best_size (data_as_long, nitems,
ideal_width, ideal_height, ideal_width, ideal_height,
&w, &h, &best)) &w, &h, &best))
{ {
@ -261,7 +261,7 @@ read_rgb_icon (MetaDisplay *display,
return FALSE; return FALSE;
} }
if (!find_best_size (data, nitems, if (!find_best_size (data_as_long, nitems,
ideal_mini_width, ideal_mini_height, ideal_mini_width, ideal_mini_height,
&mini_w, &mini_h, &best_mini)) &mini_w, &mini_h, &best_mini))
{ {
@ -464,7 +464,8 @@ get_kwm_win_icon (MetaDisplay *display,
int format; int format;
gulong nitems; gulong nitems;
gulong bytes_after; gulong bytes_after;
Pixmap *icons; guchar *data;
Pixmap *icons = (Pixmap*) icons;
int err, result; int err, result;
*pixmap = None; *pixmap = None;
@ -478,7 +479,7 @@ get_kwm_win_icon (MetaDisplay *display,
False, False,
display->atom__KWM_WIN_ICON, display->atom__KWM_WIN_ICON,
&type, &format, &nitems, &type, &format, &nitems,
&bytes_after, (guchar **)&icons); &bytes_after, &data);
err = meta_error_trap_pop_with_return (display, TRUE); err = meta_error_trap_pop_with_return (display, TRUE);
if (err != Success || if (err != Success ||

4
src/core/testasyncgetprop.c
View File

@ -187,7 +187,7 @@ try_get_reply (Display *xdisplay,
int actual_format; int actual_format;
unsigned long n_items; unsigned long n_items;
unsigned long bytes_after; unsigned long bytes_after;
char *data; unsigned char *data;
char *name; char *name;
struct timeval current_time; struct timeval current_time;
@ -421,7 +421,7 @@ run_speed_comparison (Display *xdisplay,
int actual_format; int actual_format;
unsigned long n_items; unsigned long n_items;
unsigned long bytes_after; unsigned long bytes_after;
char *data; unsigned char *data;
assert (ag_task_have_reply (task)); assert (ag_task_have_reply (task));

4
src/core/xprops.c
View File

@ -199,7 +199,7 @@ get_property (MetaDisplay *display,
False, req_type, &results->type, &results->format, False, req_type, &results->type, &results->format,
&results->n_items, &results->n_items,
&results->bytes_after, &results->bytes_after,
(guchar **)&results->prop) != Success || &results->prop) != Success ||
results->type == None) results->type == None)
{ {
if (results->prop) if (results->prop)
@ -1051,7 +1051,7 @@ meta_prop_get_values (MetaDisplay *display,
&results.type, &results.format, &results.type, &results.format,
&results.n_items, &results.n_items,
&results.bytes_after, &results.bytes_after,
(char **)(&results.prop)) != Success || &results.prop) != Success ||
results.type == None) results.type == None)
{ {
values[i].type = META_PROP_VALUE_INVALID; values[i].type = META_PROP_VALUE_INVALID;