summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-11-22 19:02:54 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-11-22 19:02:54 +0000
commitac365b4ead0789ac95a23f33ec831eaa99dd210c (patch)
tree5c3935140657264ed2de02c17bd9c3aa17362e8c /src/ui
parenta06d96316e046e5298a54b8eff13081560ca0cda (diff)
downloadmetacity-ac365b4ead0789ac95a23f33ec831eaa99dd210c.tar.gz
metacity-ac365b4ead0789ac95a23f33ec831eaa99dd210c.tar.bz2
(Apologies for huge commit; these were done on a transatlantic flight. This is why we need bzr.)
2008-11-22 Thomas Thurman <tthurman@gnome.org> * src/core/all-keybindings.h: "backward", not "backwards" throughout. 2008-11-20 Thomas Thurman <tthurman@gnome.org> * configure.in: turned on -Wall and -Werror in order to trap as many problems as possible. * src/ui/resizepopup.c: added correct #include. * src/ui/theme-viewer.c: initialised variable. * src/core/xprops.c: corrected cast. * src/core/main.c: added warning if chdir() fails. * src/core/schema-bindings.c: checking the return result of fgets(). 2008-11-20 Thomas Thurman <tthurman@gnome.org> Merged screen and window keybinding tables so that we can use just one file for the both. Also incidentally closes #528337. Further efficiencies of scale to come. * src/include/prefs.h: replace META_PREF_*_KEYBINDINGS with META_PREF_KEYBINDINGS * src/core/keybindings.c: replace *_bindings with key_bindings and similar throughout; all window-based functions are now guaranteed to receive a window so don't need to check for themselves (find_handler): moved so it can also be called from rebuild_binding_table * src/core/display-private.h: replace *_bindings with key_bindings * src/core/prefs.c: update_*_binding becomes update_key_binding; (change_notify): tidy up references to "enormous if statement" since it's almost entirely gone now * src/core/all-keybindings.h: new merged version of screen-bindings.h and window-bindings.h. svn path=/trunk/; revision=4022
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/resizepopup.c1
-rw-r--r--src/ui/theme-viewer.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
index cca4708..11698e8 100644
--- a/src/ui/resizepopup.c
+++ b/src/ui/resizepopup.c
@@ -25,6 +25,7 @@
#include "resizepopup.h"
#include "util.h"
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
struct _MetaResizePopup
{
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index a5a9497..5787ad4 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -486,7 +486,7 @@ preview_collection (int font_size,
i = 0;
while (i < META_FRAME_TYPE_LAST)
{
- const char *title;
+ const char *title = NULL;
GtkWidget *contents;
GtkWidget *align;
double xalign, yalign;