commit 138c82e18904fb3938f3b1e6540779f9b4b5341d
parent f3bfe3df7f411b28d72797f322f1d1be09da9f14
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Tue, 25 Sep 2012 16:56:03 -0600
not using favourites at the moment
Diffstat:
2 files changed, 0 insertions(+), 258 deletions(-)
diff --git a/src/viking_state.c b/src/viking_state.c
@@ -42,17 +42,6 @@ struct _Hist {
const char *__eet_filename;
};
-struct _Fav_Item {
- const char * url;
- const char * title;
- unsigned int visit_count;
-};
-
-struct _Fav {
- Eina_Hash * items;
- const char *__eet_filename;
-};
-
struct _Session_Item {
const char * url;
unsigned char focused;
@@ -73,8 +62,6 @@ struct _Session {
static const char CONFIG_ENTRY[] = "config";
static const char HIST_ITEM_ENTRY[] = "hist_item";
static const char HIST_ENTRY[] = "hist";
-static const char FAV_ITEM_ENTRY[] = "fav_item";
-static const char FAV_ENTRY[] = "fav";
static const char SESSION_ITEM_ENTRY[] = "session_item";
static const char SESSION_WINDOW_ENTRY[] = "session_window";
static const char SESSION_ENTRY[] = "session";
@@ -82,8 +69,6 @@ static const char SESSION_ENTRY[] = "session";
static Eet_Data_Descriptor *_config_descriptor = NULL;
static Eet_Data_Descriptor *_hist_item_descriptor = NULL;
static Eet_Data_Descriptor *_hist_descriptor = NULL;
-static Eet_Data_Descriptor *_fav_item_descriptor = NULL;
-static Eet_Data_Descriptor *_fav_descriptor = NULL;
static Eet_Data_Descriptor *_session_item_descriptor = NULL;
static Eet_Data_Descriptor *_session_window_descriptor = NULL;
static Eet_Data_Descriptor *_session_descriptor = NULL;
@@ -659,219 +644,6 @@ hist_save(Hist *hist, const char *filename)
}
static inline void
-_fav_item_init(void)
-{
- Eet_Data_Descriptor_Class eddc;
-
- if (_fav_item_descriptor) return;
-
- EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Fav_Item);
- _fav_item_descriptor = eet_data_descriptor_stream_new(&eddc);
-
- EET_DATA_DESCRIPTOR_ADD_BASIC(_fav_item_descriptor, Fav_Item, "url", url, EET_T_STRING);
- EET_DATA_DESCRIPTOR_ADD_BASIC(_fav_item_descriptor, Fav_Item, "title", title, EET_T_STRING);
- EET_DATA_DESCRIPTOR_ADD_BASIC(_fav_item_descriptor, Fav_Item, "visit_count", visit_count, EET_T_UINT);
-}
-
-static inline void
-_fav_item_shutdown(void)
-{
- if (!_fav_item_descriptor) return;
- eet_data_descriptor_free(_fav_item_descriptor);
- _fav_item_descriptor = NULL;
-}
-
-Fav_Item *
-fav_item_new(const char * url, const char * title, unsigned int visit_count)
-{
- Fav_Item *fav_item = calloc(1, sizeof(Fav_Item));
-
- if (!fav_item)
- {
- fprintf(stderr, "ERROR: could not calloc Fav_Item\n");
- return NULL;
- }
-
- fav_item->url = eina_stringshare_add(url);
- fav_item->title = eina_stringshare_add(title);
- fav_item->visit_count = visit_count;
-
- return fav_item;
-}
-
-void
-fav_item_free(Fav_Item *fav_item)
-{
- eina_stringshare_del(fav_item->url);
- eina_stringshare_del(fav_item->title);
- free(fav_item);
-}
-
-inline const char *
-fav_item_url_get(const Fav_Item *fav_item)
-{
- return fav_item->url;
-}
-
-inline void
-fav_item_url_set(Fav_Item *fav_item, const char *url)
-{
- EINA_SAFETY_ON_NULL_RETURN(fav_item);
- eina_stringshare_replace(&(fav_item->url), url);
-}
-
-inline const char *
-fav_item_title_get(const Fav_Item *fav_item)
-{
- return fav_item->title;
-}
-
-inline void
-fav_item_title_set(Fav_Item *fav_item, const char *title)
-{
- EINA_SAFETY_ON_NULL_RETURN(fav_item);
- eina_stringshare_replace(&(fav_item->title), title);
-}
-
-inline unsigned int
-fav_item_visit_count_get(const Fav_Item *fav_item)
-{
- return fav_item->visit_count;
-}
-
-inline void
-fav_item_visit_count_set(Fav_Item *fav_item, unsigned int visit_count)
-{
- EINA_SAFETY_ON_NULL_RETURN(fav_item);
- fav_item->visit_count = visit_count;
-}
-
-
-static inline void
-_fav_init(void)
-{
- Eet_Data_Descriptor_Class eddc;
-
- if (_fav_descriptor) return;
-
- EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Fav);
- _fav_descriptor = eet_data_descriptor_stream_new(&eddc);
-
- EET_DATA_DESCRIPTOR_ADD_HASH(_fav_descriptor, Fav, "items", items, _fav_item_descriptor);
-}
-
-static inline void
-_fav_shutdown(void)
-{
- if (!_fav_descriptor) return;
- eet_data_descriptor_free(_fav_descriptor);
- _fav_descriptor = NULL;
-}
-
-Fav *
-fav_new()
-{
- Fav *fav = calloc(1, sizeof(Fav));
-
- if (!fav)
- {
- fprintf(stderr, "ERROR: could not calloc Fav\n");
- return NULL;
- }
-
- fav->items = eina_hash_stringshared_new(EINA_FREE_CB(fav_item_free));
-
- return fav;
-}
-
-void
-fav_free(Fav *fav)
-{
- if (fav->items) eina_hash_free(fav->items);
- free(fav);
-}
-
-void
-fav_items_add(Fav *fav, const char * url, Fav_Item *fav_item)
-{
- EINA_SAFETY_ON_NULL_RETURN(fav);
- eina_hash_add(fav->items, url, fav_item);
-}
-
-void
-fav_items_del(Fav *fav, const char * url)
-{
- EINA_SAFETY_ON_NULL_RETURN(fav);
- eina_hash_del(fav->items, url, NULL);
-}
-
-inline Fav_Item *
-fav_items_get(const Fav *fav, const char * url)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(fav, NULL);
- return eina_hash_find(fav->items, url);
-}
-
-inline Eina_Hash *
-fav_items_hash_get(const Fav *fav)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(fav, NULL);
- return fav->items;
-}
-
-void
-fav_items_modify(Fav *fav, const char * key, void *value)
-{
- EINA_SAFETY_ON_NULL_RETURN(fav);
- eina_hash_modify(fav->items, key, value);
-}
-
-Fav *
-fav_load(const char *filename)
-{
- Fav *fav = NULL;
- Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
- if (!ef)
- {
- fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
- return NULL;
- }
-
- fav = eet_data_read(ef, _fav_descriptor, FAV_ENTRY);
- if (!fav) goto end;
- fav->__eet_filename = eina_stringshare_add(filename);
-
- if (!fav->items) fav->items = eina_hash_stringshared_new(EINA_FREE_CB(fav_item_free));
-
-end:
- eet_close(ef);
- return fav;
-}
-
-Eina_Bool
-fav_save(Fav *fav, const char *filename)
-{
- Eet_File *ef;
- Eina_Bool ret;
-
- if (filename) eina_stringshare_replace(&(fav->__eet_filename), filename);
- else if (fav->__eet_filename) filename = fav->__eet_filename;
- else return EINA_FALSE;
-
- ef = eet_open(filename, EET_FILE_MODE_READ_WRITE);
- if (!ef)
- {
- fprintf(stderr, "ERROR: could not open '%s' for write\n", filename);
- return EINA_FALSE;
- }
-
- ret = !!eet_data_write(ef, _fav_descriptor, FAV_ENTRY, fav, EINA_TRUE);
- eet_close(ef);
-
- return ret;
-}
-
-static inline void
_session_item_init(void)
{
Eet_Data_Descriptor_Class eddc;
@@ -1237,8 +1009,6 @@ viking_state_init(void)
_config_init();
_hist_item_init();
_hist_init();
- _fav_item_init();
- _fav_init();
_session_item_init();
_session_window_init();
_session_init();
@@ -1250,8 +1020,6 @@ viking_state_shutdown(void)
_config_shutdown();
_hist_item_shutdown();
_hist_shutdown();
- _fav_item_shutdown();
- _fav_shutdown();
_session_item_shutdown();
_session_window_shutdown();
_session_shutdown();
diff --git a/src/viking_state.h b/src/viking_state.h
@@ -10,8 +10,6 @@
typedef struct _Config Config;
typedef struct _Hist_Item Hist_Item;
typedef struct _Hist Hist;
-typedef struct _Fav_Item Fav_Item;
-typedef struct _Fav Fav;
typedef struct _Session_Item Session_Item;
typedef struct _Session_Window Session_Window;
typedef struct _Session Session;
@@ -84,30 +82,6 @@ void hist_items_modify(Hist *hist, const char * key, void *value);
Hist *hist_load(const char *filename);
Eina_Bool hist_save(Hist *hist, const char *filename);
-/* Fav_Item */
-Fav_Item *fav_item_new(const char * url, const char * title, unsigned int visit_count);
-void fav_item_free(Fav_Item *fav_item);
-
-void fav_item_url_set(Fav_Item *fav_item, const char * url);
-const char * fav_item_url_get(const Fav_Item *fav_item);
-void fav_item_title_set(Fav_Item *fav_item, const char * title);
-const char * fav_item_title_get(const Fav_Item *fav_item);
-void fav_item_visit_count_set(Fav_Item *fav_item, unsigned int visit_count);
-unsigned int fav_item_visit_count_get(const Fav_Item *fav_item);
-
-/* Fav */
-Fav *fav_new(void);
-void fav_free(Fav *fav);
-
-void fav_items_add(Fav *fav, const char * url, Fav_Item *fav_item);
-void fav_items_del(Fav *fav, const char * url);
-Fav_Item *fav_items_get(const Fav *fav, const char * key);
-Eina_Hash *fav_items_hash_get(const Fav *fav);
-void fav_items_modify(Fav *fav, const char * key, void *value);
-
-Fav *fav_load(const char *filename);
-Eina_Bool fav_save(Fav *fav, const char *filename);
-
/* Session_Item */
Session_Item *session_item_new(const char * url, unsigned char focused, int scroll_x, int scroll_y);
void session_item_free(Session_Item *session_item);
