grim/guifications3

the start of the conversion to gplugin

2012-04-30, Gary Kramlich
65091b5b15de
Parents 79d652b1a03b
Children e62da38a5799
the start of the conversion to gplugin
4 files changed, 8 insertions(+), 29 deletions(-)
  • +3 -6
    gflib/CMakeLists.txt
  • +1 -13
    gflib/gflib/CMakeLists.txt
  • +4 -7
    gflib/gflib/gf_core.c
  • +0 -3
    gflib/gflib/gf_private.h
    • --- a/gflib/CMakeLists.txt Mon Apr 30 00:09:12 2012 -0500
    +++ b/gflib/CMakeLists.txt Mon Apr 30 00:09:32 2012 -0500
    @@ -5,22 +5,19 @@
    include(gflib)
    GFLIB_LIBRARY_PROJECT(gflib 0 0 1 dev)
    -pkg_check_modules(GDS REQUIRED gds>=0.0.6)
    -pkg_check_modules(GMODULE REQUIRED gmodule-2.0>=2.26.0)
    +pkg_check_modules(GPLUGIN REQUIRED gplugin>=0.0.1)
    pkg_check_modules(GIO REQUIRED gio-2.0>=2.26.0)
    include_directories(
    ${CMAKE_SOURCE_DIR}
    ${CMAKE_BINARY_DIR}
    - ${GDS_INCLUDE_DIRS}
    ${GIO_INCLUDE_DIRS}
    - ${GMODULE_INCLUDE_DIRS}
    + ${GPLUGIN_INCLUDE_DIRS}
    )
    link_directories(
    - ${GDS_LIBRARY_DIRS}
    ${GIO_LIBRARY_DIRS}
    - ${GMODULE_LIBRARY_DIRS}
    + ${GPLUGIN_LIBRARY_DIRS}
    )
    # Subdirectories
    --- a/gflib/gflib/CMakeLists.txt Mon Apr 30 00:09:12 2012 -0500
    +++ b/gflib/gflib/CMakeLists.txt Mon Apr 30 00:09:32 2012 -0500
    @@ -19,13 +19,8 @@
    gf_log.h
    gf_logger.h
    gf_named_object.h
    - gf_native_plugin.h
    - gf_native_plugin_loader.h
    gf_object.h
    gf_plugin.h
    - gf_plugin_info.h
    - gf_plugin_loader.h
    - gf_plugin_manager.h
    gf_preference.h
    gf_preference_engine.h
    gf_preference_engine_null.h
    @@ -67,13 +62,7 @@
    gf_logger.c
    gf_marshallers.c
    gf_named_object.c
    - gf_native_plugin.c
    - gf_native_plugin_loader.c
    gf_object.c
    - gf_plugin.c
    - gf_plugin_info.c
    - gf_plugin_loader.c
    - gf_plugin_manager.c
    gf_preference.c
    gf_preference_engine.c
    gf_preference_engine_null.c
    @@ -164,8 +153,7 @@
    target_link_libraries(gflib
    ${GLIB_LIBRARIES}
    - ${GDS_LIBRARIES}
    - ${GMODULE_LIBRARIES}
    + ${GPLUGIN_LIBRARIES}
    )
    ###############################################################################
    --- a/gflib/gflib/gf_core.c Mon Apr 30 00:09:12 2012 -0500
    +++ b/gflib/gflib/gf_core.c Mon Apr 30 00:09:32 2012 -0500
    @@ -42,6 +42,8 @@
    #include <stdio.h>
    #include <stdlib.h>
    +#include <gplugin.h>
    +
    #include <gflib/gf_intl.h>
    #include <gflib/gf_core.h>
    #include <gflib/gf_log.h>
    @@ -60,11 +62,6 @@
    "The uri describing the preference engine and options.",
    "uri",
    }, {
    - "disable-plugins", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_NONE,
    - &disable_plugins,
    - "Tells gflib to not load any plugins.",
    - NULL,
    - }, {
    NULL,
    },
    };
    @@ -124,7 +121,7 @@
    gf_preferences_init(appname, prefs_uri);
    /* initialize the plugin manager */
    - gf_plugin_manager_init(disable_plugins);
    + gplugin_init();
    /* initialize the connection manager
    *
    @@ -142,7 +139,7 @@
    void
    gf_lib_uninit(void) {
    gf_connection_manager_uninit();
    - gf_plugin_manager_uninit();
    + gplugin_uninit();
    gf_preferences_uninit();
    gf_log_uninit();
    }
    --- a/gflib/gflib/gf_private.h Mon Apr 30 00:09:12 2012 -0500
    +++ b/gflib/gflib/gf_private.h Mon Apr 30 00:09:32 2012 -0500
    @@ -26,9 +26,6 @@
    G_BEGIN_DECLS
    -void gf_plugin_manager_init(gboolean disable_plugins);
    -void gf_plugin_manager_uninit(void);
    -
    void gf_plugin_set_state(GfPlugin *plugin, GfPluginState state);
    void gf_preferences_init(const gchar *appname, const gchar *uri);