forked from AuroraMiddleware/gtk
#include <X11/extensions/Xrandr.h> if we have RandR support, for
Mon Oct 27 15:47:58 2003 Manish Singh <yosh@gimp.org> * gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if we have RandR support, for XRRUpdateConfiguration declaration. * gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch declaration. * gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make length a gsize variable, since that's what g_file_get_contents() expects.
This commit is contained in:
parent
208b445f0d
commit
afad91fe8d
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
Mon Oct 27 15:47:58 2003 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
|
||||
we have RandR support, for XRRUpdateConfiguration declaration.
|
||||
|
||||
* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
|
||||
declaration.
|
||||
|
||||
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
|
||||
length a gsize variable, since that's what g_file_get_contents()
|
||||
expects.
|
||||
|
||||
Mon Oct 27 12:18:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* NEWS: Fix attribution for above/below EWMH work.
|
||||
|
@ -1,3 +1,15 @@
|
||||
Mon Oct 27 15:47:58 2003 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
|
||||
we have RandR support, for XRRUpdateConfiguration declaration.
|
||||
|
||||
* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
|
||||
declaration.
|
||||
|
||||
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
|
||||
length a gsize variable, since that's what g_file_get_contents()
|
||||
expects.
|
||||
|
||||
Mon Oct 27 12:18:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* NEWS: Fix attribution for above/below EWMH work.
|
||||
|
@ -1,3 +1,15 @@
|
||||
Mon Oct 27 15:47:58 2003 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
|
||||
we have RandR support, for XRRUpdateConfiguration declaration.
|
||||
|
||||
* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
|
||||
declaration.
|
||||
|
||||
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
|
||||
length a gsize variable, since that's what g_file_get_contents()
|
||||
expects.
|
||||
|
||||
Mon Oct 27 12:18:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* NEWS: Fix attribution for above/below EWMH work.
|
||||
|
@ -1,3 +1,15 @@
|
||||
Mon Oct 27 15:47:58 2003 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
|
||||
we have RandR support, for XRRUpdateConfiguration declaration.
|
||||
|
||||
* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
|
||||
declaration.
|
||||
|
||||
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
|
||||
length a gsize variable, since that's what g_file_get_contents()
|
||||
expects.
|
||||
|
||||
Mon Oct 27 12:18:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* NEWS: Fix attribution for above/below EWMH work.
|
||||
|
@ -1,3 +1,15 @@
|
||||
Mon Oct 27 15:47:58 2003 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gdk/x11/gdkscreen-x11.c: #include <X11/extensions/Xrandr.h> if
|
||||
we have RandR support, for XRRUpdateConfiguration declaration.
|
||||
|
||||
* gtk/gtkfilefilter.c: #include "gtkprivate.h" for _gtk_fnmatch
|
||||
declaration.
|
||||
|
||||
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui_from_file): Make
|
||||
length a gsize variable, since that's what g_file_get_contents()
|
||||
expects.
|
||||
|
||||
Mon Oct 27 12:18:49 2003 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* NEWS: Fix attribution for above/below EWMH work.
|
||||
|
@ -39,6 +39,10 @@
|
||||
#include <X11/extensions/Xinerama.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_RANDR
|
||||
#include <X11/extensions/Xrandr.h>
|
||||
#endif
|
||||
|
||||
static void gdk_screen_x11_class_init (GdkScreenX11Class *klass);
|
||||
static void gdk_screen_x11_dispose (GObject *object);
|
||||
static void gdk_screen_x11_finalize (GObject *object);
|
||||
|
@ -22,6 +22,7 @@
|
||||
|
||||
#include "gtkfilefilter.h"
|
||||
#include "gtkobject.h"
|
||||
#include "gtkprivate.h"
|
||||
|
||||
typedef struct _GtkFileFilterClass GtkFileFilterClass;
|
||||
typedef struct _FilterRule FilterRule;
|
||||
|
@ -1280,7 +1280,7 @@ gtk_ui_manager_add_ui_from_file (GtkUIManager *self,
|
||||
GError **error)
|
||||
{
|
||||
gchar *buffer;
|
||||
gint length;
|
||||
gsize length;
|
||||
guint res;
|
||||
|
||||
g_return_val_if_fail (GTK_IS_UI_MANAGER (self), 0);
|
||||
|
Loading…
Reference in New Issue
Block a user