Changeset 65498 in webkit
- Timestamp:
- Aug 17, 2010 6:09:57 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.gitignore
r65365 r65498 64 64 /aclocal.m4 65 65 /autom4te.cache 66 /autotools 66 /autotools/compile 67 /autotools/config.guess 68 /autotools/config.sub 69 /autotools/depcomp 70 /autotools/gtk-doc.m4 71 /autotools/install-sh 72 /autotools/libtool.m4 73 /autotools/ltmain.sh 74 /autotools/ltoptions.m4 75 /autotools/ltsugar.m4 76 /autotools/ltversion.m4 77 /autotools/lt~obsolete.m4 78 /autotools/missing 67 79 /autotoolsconfig.h.in 68 80 /configure -
trunk/ChangeLog
r65446 r65498 1 2010-08-17 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] GSettings support adds annoying warnings on systems with older glib versions 6 https://bugs.webkit.org/show_bug.cgi?id=44056 7 8 Add file containing GLIB_GSETTINGS macro so that 9 configure doesn't spit warnings in older systems. 10 11 * autotools/gsettings.m4: Added. 12 * .gitignore: Ignore files that are generated inside autotools 13 explicitely, because we have some that are kept in version 14 control. 15 1 16 2010-08-16 Paul Sawaya <psawaya@apple.com> 2 17 -
trunk/WebKit/gtk/ChangeLog
r65257 r65498 1 2010-08-17 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] GSettings support adds annoying warnings on systems with older glib versions 6 https://bugs.webkit.org/show_bug.cgi?id=44056 7 8 Use #ifdef instead of #if for HAVE_GSETTINGS to avoid warnings 9 when it is not defined. 10 11 * WebCoreSupport/InspectorClientGtk.cpp: 12 * webkit/webkitprivate.cpp: 13 (webkit_init): 14 * webkit/webkitprivate.h: 15 1 16 2010-08-12 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> 2 17 -
trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp
r65255 r65498 120 120 } 121 121 122 #if HAVE_GSETTINGS122 #ifdef HAVE_GSETTINGS 123 123 static String toGSettingName(String inspectorSettingName) 124 124 { -
trunk/WebKit/gtk/webkit/webkitprivate.cpp
r65255 r65498 216 216 } 217 217 218 #if HAVE_GSETTINGS218 #ifdef HAVE_GSETTINGS 219 219 static bool isSchemaAvailable(char* schemaID) 220 220 { … … 279 279 webkit_set_cache_model(WEBKIT_CACHE_MODEL_WEB_BROWSER); 280 280 281 #if HAVE_GSETTINGS281 #ifdef HAVE_GSETTINGS 282 282 // Initialize settings variables here to make sure this happens in 283 283 // the main thread. -
trunk/WebKit/gtk/webkit/webkitprivate.h
r65255 r65498 121 121 void webkit_init(); 122 122 123 #if HAVE_GSETTINGS123 #ifdef HAVE_GSETTINGS 124 124 GSettings* inspectorGSettings(); 125 125 #endif
Note: See TracChangeset
for help on using the changeset viewer.