diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-09-13 16:00:00 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-09-13 16:00:00 +0000 |
| commit | e0ac74f4973e2da79c2bbb29c57611e9af362600 (patch) | |
| tree | d3cc122fd2e74d7354b21c68180f6658fd56d930 /gtk | |
| parent | 22c9f6e83f2b8fb32ec14de5be91ae74422f29f9 (diff) | |
| download | gtk+-e0ac74f4973e2da79c2bbb29c57611e9af362600.tar.gz | |
Fix some problems reported by Morten Welinder:
2004-09-13 Matthias Clasen <mclasen@redhat.com>
Fix some problems reported by Morten Welinder:
* gtk/gtkfilesystem.c: Include gtkmodules.h, not gtkmain.h, since
the modules stuff moved.
* gtk/gtkmain.c (gtk_arg_no_debug_cb): Add a missing return
* gtk/gtksettings.c: Add missing include.
(settings_update_modules): Remove an unused variable.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkfilesystem.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 2 | ||||
| -rw-r--r-- | gtk/gtksettings.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index 92048563a7..4943d0024b 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -23,7 +23,7 @@ #include "gtkalias.h" #include "gtkfilesystem.h" #include "gtkicontheme.h" -#include "gtkmain.h" +#include "gtkmodules.h" #include <string.h> diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 9f2baa483c..265f6fb0fb 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -367,6 +367,8 @@ gtk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data) gtk_debug_flags &= ~g_parse_debug_string (value, gtk_debug_keys, gtk_ndebug_keys); + + return TRUE; } #endif /* G_ENABLE_DEBUG */ diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 0767b35e24..932d293157 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -18,6 +18,7 @@ #include <config.h> #include "gtkalias.h" +#include "gtkmodules.h" #include "gtksettings.h" #include "gtkrc.h" #include "gtkintl.h" @@ -1382,7 +1383,6 @@ settings_update_double_click (GtkSettings *settings) static void settings_update_modules (GtkSettings *settings) { - GdkDisplay *display = gdk_screen_get_display (settings->screen); gchar *modules; g_object_get (settings, |