AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some problems reported by Morten Welinder:

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2004-09-13 16:00:00 +00:00 committed by Matthias Clasen
parent 22c9f6e83f
commit e0ac74f497
7 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
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.
2004-09-13 Matthias Clasen <mclasen@redhat.com> 2004-09-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
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.
2004-09-13 Matthias Clasen <mclasen@redhat.com> 2004-09-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
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.
2004-09-13 Matthias Clasen <mclasen@redhat.com> 2004-09-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
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.
2004-09-13 Matthias Clasen <mclasen@redhat.com> 2004-09-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup): * gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):

2
gtk/gtkfilesystem.c
View File

@ -23,7 +23,7 @@
#include "gtkalias.h" #include "gtkalias.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkmain.h" #include "gtkmodules.h"
#include <string.h> #include <string.h>

2
gtk/gtkmain.c
View File

@ -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_flags &= ~g_parse_debug_string (value,
gtk_debug_keys, gtk_debug_keys,
gtk_ndebug_keys); gtk_ndebug_keys);
return TRUE;
} }
#endif /* G_ENABLE_DEBUG */ #endif /* G_ENABLE_DEBUG */

2
gtk/gtksettings.c
View File

@ -18,6 +18,7 @@
#include <config.h> #include <config.h>
#include "gtkalias.h" #include "gtkalias.h"
#include "gtkmodules.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkrc.h" #include "gtkrc.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -1382,7 +1383,6 @@ settings_update_double_click (GtkSettings *settings)
static void static void
settings_update_modules (GtkSettings *settings) settings_update_modules (GtkSettings *settings)
{ {
GdkDisplay *display = gdk_screen_get_display (settings->screen);
gchar *modules; gchar *modules;
g_object_get (settings, g_object_get (settings,