Hiroyuki Ikezoe
ikezo****@users*****
Sun Dec 31 21:21:48 JST 2006
Index: kazehakase/src/actions/kz-actions-popup.c
diff -u kazehakase/src/actions/kz-actions-popup.c:1.60 kazehakase/src/actions/kz-actions-popup.c:1.61
--- kazehakase/src/actions/kz-actions-popup.c:1.60 Sun Dec 31 10:59:41 2006
+++ kazehakase/src/actions/kz-actions-popup.c Sun Dec 31 21:21:48 2006
@@ -101,7 +101,7 @@
break;
case NEW_WINDOW:
{
- GtkWidget *widget = kz_window_new(uri);
+ GtkWidget *widget = kz_app_create_new_window(kz_app, uri);
gtk_widget_show(widget);
break;
}
@@ -414,7 +414,7 @@
G_CALLBACK(cb_popup_menu_hide), kz);
}
-GtkActionEntry kz_actions_popup[] =
+static GtkActionEntry kz_actions_popup[] =
{
/* Toplevel */
@@ -453,7 +453,7 @@
{"StockOpenSmartBookmark", NULL, N_("Open Smartbookmark by selected text"), NULL, NULL, NULL},
};
-const gint kz_actions_popup_len = G_N_ELEMENTS(kz_actions_popup);
+static const gint kz_actions_popup_len = G_N_ELEMENTS(kz_actions_popup);
GtkActionGroup *
Index: kazehakase/src/actions/kz-actions-popup.h
diff -u kazehakase/src/actions/kz-actions-popup.h:1.6 kazehakase/src/actions/kz-actions-popup.h:1.7
--- kazehakase/src/actions/kz-actions-popup.h:1.6 Tue Apr 25 11:45:41 2006
+++ kazehakase/src/actions/kz-actions-popup.h Sun Dec 31 21:21:48 2006
@@ -34,9 +34,6 @@
G_BEGIN_DECLS
-extern GtkActionEntry kz_actions_popup[];
-extern const gint kz_actions_popup_len;
-
GtkActionGroup *kz_actions_popup_create_group (KzWindow *kz);
void kz_actions_popup_menu_modal (KzWindow *kz,
Index: kazehakase/src/actions/kz-actions.c
diff -u kazehakase/src/actions/kz-actions.c:1.230 kazehakase/src/actions/kz-actions.c:1.231
--- kazehakase/src/actions/kz-actions.c:1.230 Sun Dec 31 19:27:47 2006
+++ kazehakase/src/actions/kz-actions.c Sun Dec 31 21:21:48 2006
@@ -125,7 +125,7 @@
g_return_if_fail(KZ_IS_WINDOW(kz));
- widget = kz_window_new(NULL);
+ widget = kz_app_create_new_window(kz_app, NULL);
gtk_widget_show(widget);
}
@@ -1446,7 +1446,7 @@
g_free(current_session);
kz_bookmark_file_load(KZ_BOOKMARK_FILE(tmp_bookmark));
- window_list = kz_window_get_window_list();
+ window_list = KZ_GET_WINDOW_LIST;
for (node = window_list; node; node = g_list_next (node))
{
KzWindow *window = KZ_WINDOW(node->data);
@@ -1471,7 +1471,7 @@
if (!window_node)
{
- window = KZ_WINDOW(kz_window_new(NULL));
+ window = KZ_WINDOW(kz_app_create_new_window(kz_app, NULL));
gtk_widget_show(GTK_WIDGET(window));
}
else
Index: kazehakase/src/actions/kz-location-entry-action.c
diff -u kazehakase/src/actions/kz-location-entry-action.c:1.54 kazehakase/src/actions/kz-location-entry-action.c:1.55
--- kazehakase/src/actions/kz-location-entry-action.c:1.54 Sun Dec 31 10:36:03 2006
+++ kazehakase/src/actions/kz-location-entry-action.c Sun Dec 31 21:21:48 2006
@@ -445,7 +445,7 @@
kz_location_entry_action_store_history
(KZ_LOCATION_ENTRY_ACTION(action));
- list = kz_window_get_window_list();
+ list = KZ_GET_WINDOW_LIST;
for (node = list; node; node = g_list_next(node))
{
KzWindow *tmpkz = node->data;