Hiroyuki Ikezoe
ikezo****@users*****
Sun Dec 31 10:36:03 JST 2006
Index: kazehakase/src/actions/kz-actions-dynamic.c
diff -u kazehakase/src/actions/kz-actions-dynamic.c:1.11 kazehakase/src/actions/kz-actions-dynamic.c:1.12
--- kazehakase/src/actions/kz-actions-dynamic.c:1.11 Mon May 22 08:48:54 2006
+++ kazehakase/src/actions/kz-actions-dynamic.c Sun Dec 31 10:36:03 2006
@@ -318,7 +318,7 @@
GList *children, *node;
GtkWidget *smart_bookmark_submenu = NULL;
const gchar *title;
- KzBookmark *bookmark = kz_bookmarks->smarts;
+ KzBookmark *bookmark = KZ_GET_SMART_BOOKMARK;
KzBookmark *child, *smart;
smart_bookmark_submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu));
Index: kazehakase/src/actions/kz-actions.c
diff -u kazehakase/src/actions/kz-actions.c:1.227 kazehakase/src/actions/kz-actions.c:1.228
--- kazehakase/src/actions/kz-actions.c:1.227 Sat Dec 30 21:51:02 2006
+++ kazehakase/src/actions/kz-actions.c Sun Dec 31 10:36:03 2006
@@ -1252,7 +1252,7 @@
g_return_if_fail(KZ_IS_WINDOW(kz));
- bookmark = kz_bookmarks->bookmark_bars;
+ bookmark = KZ_GET_BAR_BOOKMARK;
g_return_if_fail(KZ_IS_BOOKMARK(bookmark));
g_return_if_fail(kz_bookmark_is_folder(bookmark));
@@ -1270,7 +1270,7 @@
g_return_if_fail(KZ_IS_WINDOW(kz));
- bookmark = kz_bookmarks->smarts;
+ bookmark = KZ_GET_SMART_BOOKMARK;
g_return_if_fail(KZ_IS_BOOKMARK(bookmark));
g_return_if_fail(kz_bookmark_is_folder(bookmark));
@@ -1297,7 +1297,7 @@
static void
act_clip_selection (GtkAction *action, KzWindow *kz)
{
- KzBookmark *clip = kz_bookmarks->clip, *bookmark;
+ KzBookmark *clip, *bookmark;
GtkWidget *embed;
const gchar *title, *uri;
gchar *source = NULL;
@@ -1314,6 +1314,7 @@
embed = KZ_WINDOW_CURRENT_PAGE(kz);
if (!KZ_IS_EMBED(embed)) return;
+ clip = KZ_GET_CLIP_BOOKMARK;
g_get_current_time(&now);
title = kz_window_get_title(kz);
@@ -1371,7 +1372,7 @@
kz_bookmark_file_set_location(KZ_BOOKMARK_FILE(bookmark), uri);
kz_bookmark_prepend(clip, bookmark);
- kz_bookmark_file_save(KZ_BOOKMARK_FILE(kz_bookmarks->clip));
+ kz_bookmark_file_save(KZ_BOOKMARK_FILE(clip));
g_free(link);
g_free(filename);
@@ -1413,7 +1414,7 @@
act_save_session (GtkAction *action, KzWindow *kz)
{
/*FIXME! set current tab position */
- kz_bookmark_file_save(KZ_BOOKMARK_FILE(kz_bookmarks->current_session));
+ kz_bookmark_file_save(KZ_BOOKMARK_FILE(KZ_GET_CURRENT_SESSION));
}
@@ -2518,7 +2519,7 @@
active = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
KZ_WINDOW_SET_VISIBLE(kz, "StockSidebarPosMenu", active);
- set_popup_menu_sensitive(kz, kz_bookmarks->menu);
+ set_popup_menu_sensitive(kz, KZ_GET_MENU_BOOKMARK);
}
@@ -2611,7 +2612,7 @@
if (KZ_IS_BOOKMARK(bookmark))
return bookmark;
- return kz_bookmarks->menu;
+ return KZ_GET_MENU_BOOKMARK;
}
@@ -2669,7 +2670,7 @@
kz_actions_set_bookmark_for_action (kz, NULL);
- set_popup_menu_sensitive (kz, kz_bookmarks->menu);
+ set_popup_menu_sensitive (kz, KZ_GET_MENU_BOOKMARK);
}
Index: kazehakase/src/actions/kz-location-entry-action.c
diff -u kazehakase/src/actions/kz-location-entry-action.c:1.53 kazehakase/src/actions/kz-location-entry-action.c:1.54
--- kazehakase/src/actions/kz-location-entry-action.c:1.53 Sat Dec 2 18:50:49 2006
+++ kazehakase/src/actions/kz-location-entry-action.c Sun Dec 31 10:36:03 2006
@@ -140,9 +140,9 @@
if (action->kz)
{
- kz_profile_set_save_each_time(kz_global_profile, FALSE);
+ kz_profile_set_save_each_time(KZ_GET_GLOBAL_PROFILE, FALSE);
kz_location_entry_action_store_history(action);
- kz_profile_set_save_each_time(kz_global_profile, TRUE);
+ kz_profile_set_save_each_time(KZ_GET_GLOBAL_PROFILE, TRUE);
g_object_unref(action->kz);
action->kz = NULL;
}
@@ -271,7 +271,7 @@
G_CALLBACK(cb_entry_key_press), action);
g_signal_connect(entry, "populate-popup",
G_CALLBACK(cb_entry_populate_popup), action);
- g_signal_connect(kz_global_profile, "changed::Global",
+ g_signal_connect(KZ_GET_GLOBAL_PROFILE, "changed::Global",
G_CALLBACK(cb_profile_global_changed), entry);
}
}
@@ -298,7 +298,7 @@
G_CALLBACK(cb_entry_populate_popup),
action);
g_signal_handlers_disconnect_by_func
- (kz_global_profile,
+ (KZ_GET_GLOBAL_PROFILE,
G_CALLBACK(cb_profile_global_changed),
entry);
g_object_set_data(G_OBJECT(entry),
@@ -334,9 +334,9 @@
"stock_id", GTK_STOCK_NEW,
"kz-window", kz,
NULL);
- kz_profile_set_save_each_time(kz_global_profile, FALSE);
+ kz_profile_set_save_each_time(KZ_GET_GLOBAL_PROFILE, FALSE);
kz_location_entry_action_restore_history(action);
- kz_profile_set_save_each_time(kz_global_profile, TRUE);
+ kz_profile_set_save_each_time(KZ_GET_GLOBAL_PROFILE, TRUE);
return action;
}
@@ -347,16 +347,18 @@
{
GList *list, *node;
gint i = 0;
+ KzProfile *profile;
g_return_if_fail(KZ_IS_LOCATION_ENTRY_ACTION(action));
-
- list = kz_profile_enum_key(kz_global_profile, "LocationEntry", TRUE);
+
+ profile = KZ_GET_GLOBAL_PROFILE;
+ list = kz_profile_enum_key(profile, "LocationEntry", TRUE);
for (node = list; node; node = g_list_next(node))
{
const gchar *key = node->data;
if (key && *key && key_seems_sequential(key, "history"))
- kz_profile_delete_key(kz_global_profile,
+ kz_profile_delete_key(profile,
"LocationEntry", key);
}
g_list_free(list);
@@ -394,7 +396,7 @@
text = g_strdup(kz_entry_action_get_text(KZ_ENTRY_ACTION(action)));
- list = kz_profile_enum_key(kz_global_profile, "LocationEntry", TRUE);
+ list = kz_profile_enum_key(KZ_GET_GLOBAL_PROFILE, "LocationEntry", TRUE);
for (node = list; node; node = g_list_next(node))
{
const gchar *key = node->data;
Index: kazehakase/src/actions/kz-smart-bookmark-action.c
diff -u kazehakase/src/actions/kz-smart-bookmark-action.c:1.49 kazehakase/src/actions/kz-smart-bookmark-action.c:1.50
--- kazehakase/src/actions/kz-smart-bookmark-action.c:1.49 Wed Dec 6 15:08:03 2006
+++ kazehakase/src/actions/kz-smart-bookmark-action.c Sun Dec 31 10:36:03 2006
@@ -358,7 +358,7 @@
name = g_strdup("LocationEntry");
else if (link &&
g_str_has_prefix(link, "history-search:") &&
- !kz_search)
+ !KZ_GET_SEARCH)
{
return NULL;
}