Changeset 65498 in webkit


Ignore:
Timestamp:
Aug 17, 2010 6:09:57 AM (14 years ago)
Author:
kov@webkit.org
Message:

2010-08-17 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] GSettings support adds annoying warnings on systems with older glib versions
https://bugs.webkit.org/show_bug.cgi?id=44056

Add file containing GLIB_GSETTINGS macro so that
configure doesn't spit warnings in older systems.

  • autotools/gsettings.m4: Added.
  • .gitignore: Ignore files that are generated inside autotools explicitely, because we have some that are kept in version control.

WebKit/gtk

2010-08-17 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>

Reviewed by Martin Robinson.

[GTK] GSettings support adds annoying warnings on systems with older glib versions
https://bugs.webkit.org/show_bug.cgi?id=44056

Use #ifdef instead of #if for HAVE_GSETTINGS to avoid warnings
when it is not defined.

  • WebCoreSupport/InspectorClientGtk.cpp:
  • webkit/webkitprivate.cpp: (webkit_init):
  • webkit/webkitprivate.h:
Location:
trunk
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/.gitignore

    r65365 r65498  
    6464/aclocal.m4
    6565/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
    6779/autotoolsconfig.h.in
    6880/configure
  • trunk/ChangeLog

    r65446 r65498  
     12010-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
    1162010-08-16  Paul Sawaya  <psawaya@apple.com>
    217
  • trunk/WebKit/gtk/ChangeLog

    r65257 r65498  
     12010-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
    1162010-08-12  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
    217
  • trunk/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp

    r65255 r65498  
    120120}
    121121
    122 #if HAVE_GSETTINGS
     122#ifdef HAVE_GSETTINGS
    123123static String toGSettingName(String inspectorSettingName)
    124124{
  • trunk/WebKit/gtk/webkit/webkitprivate.cpp

    r65255 r65498  
    216216}
    217217
    218 #if HAVE_GSETTINGS
     218#ifdef HAVE_GSETTINGS
    219219static bool isSchemaAvailable(char* schemaID)
    220220{
     
    279279    webkit_set_cache_model(WEBKIT_CACHE_MODEL_WEB_BROWSER);
    280280
    281 #if HAVE_GSETTINGS
     281#ifdef HAVE_GSETTINGS
    282282    // Initialize settings variables here to make sure this happens in
    283283    // the main thread.
  • trunk/WebKit/gtk/webkit/webkitprivate.h

    r65255 r65498  
    121121    void webkit_init();
    122122
    123 #if HAVE_GSETTINGS
     123#ifdef HAVE_GSETTINGS
    124124    GSettings* inspectorGSettings();
    125125#endif
Note: See TracChangeset for help on using the changeset viewer.