Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 587448
Collapse All | Expand All

(-)midori-0.5.11/CMakeLists.txt (-4 / +4 lines)
Lines 112-124 Link Here
112 
                  sqlite3>=3.6.19
 112 
                  sqlite3>=3.6.19
113 
                  gmodule-2.0
 113 
                  gmodule-2.0
114 
                  gio-2.0>=2.32.3
 114 
                  gio-2.0>=2.32.3
115 
                  libsoup-gnome-2.4>=2.37.1
 115 
                  libsoup-2.4>=2.37.1
116 
                  )
 116 
                  )
117 
add_definitions("-DHAVE_LIBXML")
 117 
add_definitions("-DHAVE_LIBXML")
118 
add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
 118 
add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
119 
add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"")
 119 
add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-2.4_VERSION}\"")
120 
set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
 120 
set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
121 
if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0")
 121 
if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.40.0")
122 
    # valac 0.16 didn't have the bindings yet
 122 
    # valac 0.16 didn't have the bindings yet
123 
    # For consistency we need to ensure C code makes the same assumptions
 123 
    # For consistency we need to ensure C code makes the same assumptions
124 
    if (${VALA_VERSION} VERSION_GREATER "0.17.0")
 124 
    if (${VALA_VERSION} VERSION_GREATER "0.17.0")
Lines 126-132 Link Here
126 
        set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
 126 
        set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
127 
    endif ()
 127 
    endif ()
128 
endif ()
 128 
endif ()
129 
if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.48.0")
 129 
if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.48.0")
130 
    add_definitions("-DHAVE_LIBSOUP_2_48_0")
 130 
    add_definitions("-DHAVE_LIBSOUP_2_48_0")
131 
    set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_48_0)
 131 
    set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_48_0)
132 
endif ()
 132 
endif ()
(-)midori-0.5.11/extensions/cookie-manager/cookie-manager.c (-2 / +2 lines)
Lines 12-18 Link Here
12 
#include "config.h"
 12 
#include "config.h"
13 
#include <midori/midori.h>
 13 
#include <midori/midori.h>
14 
#include "katze/katze.h"
 14 
#include "katze/katze.h"
15 
#include <libsoup/soup-cookie-jar-sqlite.h>
 15 
#include <libsoup/soup-cookie-jar-db.h>
16 

          16
          

        

        

          17
          
#include "cookie-manager.h"

          17
          
#include "cookie-manager.h"

        

        

          18
          
#include "cookie-manager-page.h"

          18
          
#include "cookie-manager-page.h"

        

  

    
      
            Lines 282-288
          
      
      
        Link Here
      
    
  

        

          282
          
	/* setup soup */

          282
          
	/* setup soup */

        

        

          283
          
#ifdef HAVE_WEBKIT2

          283
          
#ifdef HAVE_WEBKIT2

        

        

          284
          
	gchar *filename = midori_paths_get_config_filename_for_writing ("cookies.db");

          284
          
	gchar *filename = midori_paths_get_config_filename_for_writing ("cookies.db");

        

          
            

              285
              
	priv->jar = soup_cookie_jar_sqlite_new (filename, FALSE);


              285
              
	priv->jar = soup_cookie_jar_db_new (filename, FALSE);

            

        

          286
          
	g_free(filename);

          286
          
	g_free(filename);

        

        

          287
          
#else

          287
          
#else

        

        

          288
          
	SoupSession *session = webkit_get_default_session();

          288
          
	SoupSession *session = webkit_get_default_session();

        



(-)midori-0.5.11/midori/midori-session.c
      (-3 / +3 lines)




  

    
      
            Lines 17-24
          
      
      
        Link Here
      
    
  

        

          17
          
#include "sokoke.h"

          17
          
#include "sokoke.h"

        

        

          18
          

          18
          

        

        

          19
          
#include <glib/gi18n-lib.h>

          19
          
#include <glib/gi18n-lib.h>

        

          
            

              20
              
#include <libsoup/soup-cookie-jar-sqlite.h>


              20
              
#include <libsoup/soup-cookie-jar-db.h>

            

            

              21
              
#include <libsoup/soup-gnome-features.h>


              21
              
#include <libsoup/soup-types.h>

            

        

          22
          

          22
          

        

        

          23
          
    #define LIBSOUP_USE_UNSTABLE_REQUEST_API

          23
          
    #define LIBSOUP_USE_UNSTABLE_REQUEST_API

        

        

          24
          
    #include <libsoup/soup-cache.h>

          24
          
    #include <libsoup/soup-cache.h>

        

  

    
      
            Lines 297-303
          
      
      
        Link Here
      
    
  

        

          297
          
    g_object_unref (feature);

          297
          
    g_object_unref (feature);

        

        

          298
          

          298
          

        

        

          299
          
    katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));

          299
          
    katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));

        

          
            

              300
              
    jar = soup_cookie_jar_sqlite_new (config_file, FALSE);


              300
              
    jar = soup_cookie_jar_db_new (config_file, FALSE);

            

        

          301
          
    soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));

          301
          
    soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));

        

        

          302
          
    g_signal_connect (jar, "changed",

          302
          
    g_signal_connect (jar, "changed",

        

        

          303
          
                      G_CALLBACK (midori_session_cookie_jar_changed_cb), settings);

          303
          
                      G_CALLBACK (midori_session_cookie_jar_changed_cb), settings);

        






  

  Return to bug 587448