Hiroyuki Ikezoe
ikezo****@users*****
Tue May 16 09:18:52 JST 2006
Index: kazehakase/src/actions/kz-history-action.c
diff -u kazehakase/src/actions/kz-history-action.c:1.22 kazehakase/src/actions/kz-history-action.c:1.23
--- kazehakase/src/actions/kz-history-action.c:1.22 Wed Aug 10 22:40:00 2005
+++ kazehakase/src/actions/kz-history-action.c Tue May 16 09:18:51 2006
@@ -663,7 +663,6 @@
g_object_set(action->completion,
"text_column", use ? COLUMN_URI : -1,
NULL);
-#if GTK_CHECK_VERSION(2,6,0)
+
gtk_entry_completion_set_inline_completion(action->completion, use);
-#endif
}
Index: kazehakase/src/actions/kz-navigation-action.c
diff -u kazehakase/src/actions/kz-navigation-action.c:1.10 kazehakase/src/actions/kz-navigation-action.c:1.11
--- kazehakase/src/actions/kz-navigation-action.c:1.10 Thu Jul 14 12:06:21 2005
+++ kazehakase/src/actions/kz-navigation-action.c Tue May 16 09:18:51 2006
@@ -27,19 +27,6 @@
#include "kz-favicon.h"
#include "kz-icons.h"
-#if GTK_CHECK_VERSION(2,6,0)
-#define EGG_TYPE_DROPDOWN_TOOL_BUTTON GTK_TYPE_MENU_TOOL_BUTTON
-#define EGG_DROPDOWN_TOOL_BUTTON GTK_MENU_TOOL_BUTTON
-#define EGG_IS_DROPDOWN_TOOL_BUTTON GTK_IS_MENU_TOOL_BUTTON
-#define EggDropdownToolButton GtkMenuToolButton
-#define EGG_DROPDOWN_MENU_ACTIVATED_SIGNAL "show-menu"
-#define egg_dropdown_tool_button_set_menu gtk_menu_tool_button_set_menu
-#define egg_dropdown_tool_button_get_menu gtk_menu_tool_button_get_menu
-#else
-#include "eggdropdowntoolbutton.h"
-#define EGG_DROPDOWN_MENU_ACTIVATED_SIGNAL "menu-activated"
-#endif
-
enum {
PROP_0,
PROP_KZ_WINDOW
@@ -64,7 +51,7 @@
static void kz_navigation_action_disconnect_proxy (GtkAction *action,
GtkWidget *proxy);
#endif
-static void cb_menu_activated (EggDropdownToolButton *b,
+static void cb_menu_activated (GtkMenuToolButton *b,
KzNavigationAction *action);
static GtkActionClass *parent_class = NULL;
@@ -88,7 +75,7 @@
object_class->get_property = kz_navigation_action_get_property;
object_class->dispose = kz_navigation_action_dispose;
- action_class->toolbar_item_type = EGG_TYPE_DROPDOWN_TOOL_BUTTON;
+ action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
action_class->connect_proxy = kz_navigation_action_connect_proxy;
action_class->activate = kz_navigation_action_activate;
@@ -169,16 +156,16 @@
{
GtkWidget *menu;
- g_signal_connect (proxy, EGG_DROPDOWN_MENU_ACTIVATED_SIGNAL,
+ g_signal_connect (proxy, "show-menu",
G_CALLBACK (cb_menu_activated), action);
- if (EGG_IS_DROPDOWN_TOOL_BUTTON(proxy))
+ if (GTK_IS_MENU_TOOL_BUTTON(proxy))
{
- menu = egg_dropdown_tool_button_get_menu(EGG_DROPDOWN_TOOL_BUTTON(proxy));
+ menu = gtk_menu_tool_button_get_menu(GTK_MENU_TOOL_BUTTON(proxy));
if (!menu)
{
menu = gtk_menu_new();
- egg_dropdown_tool_button_set_menu(EGG_DROPDOWN_TOOL_BUTTON(proxy), menu);
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(proxy), menu);
}
}
@@ -230,14 +217,14 @@
}
static void
-cb_menu_activated (EggDropdownToolButton *b, KzNavigationAction *action)
+cb_menu_activated (GtkMenuToolButton *b, KzNavigationAction *action)
{
int i, pos, count;
GtkWidget *menu;
KzEmbed *kzembed = KZ_EMBED(KZ_WINDOW_CURRENT_PAGE(action->kz));
KzFavicon *kzfav = action->kz->kzfav;
- menu = egg_dropdown_tool_button_get_menu(b);
+ menu = gtk_menu_tool_button_get_menu(b);
if (menu)
{
gtk_container_foreach (GTK_CONTAINER(menu),
@@ -278,6 +265,6 @@
g_free(uri);
}
- egg_dropdown_tool_button_set_menu(b, menu);
+ gtk_menu_tool_button_set_menu(b, menu);
}