debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove the obsolete MidoriPanel::menu property

Browse source
This commit is contained in:
Christian Dywan 2010-07-29 15:39:16 +02:00
parent a724d883b1
commit 6b54f9e8b5
2 changed files with 0 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
midori/midori-browser.c
View file

@ -5864,7 +5864,6 @@ midori_browser_init (MidoriBrowser* browser)
gtk_widget_show (hpaned); gtk_widget_show (hpaned);
browser->panel = g_object_new (MIDORI_TYPE_PANEL, browser->panel = g_object_new (MIDORI_TYPE_PANEL,
"action-group", browser->action_group, "action-group", browser->action_group,
"menu", browser->menu_tools,
NULL); NULL);
g_object_connect (browser->panel, g_object_connect (browser->panel,
"signal::notify::page", "signal::notify::page",

26
midori/midori-panel.c
View file

@ -38,7 +38,6 @@ struct _MidoriPanel
GtkWidget* toolbook; GtkWidget* toolbook;
GtkWidget* notebook; GtkWidget* notebook;
GtkActionGroup* action_group; GtkActionGroup* action_group;
GtkMenu* menu;
gboolean show_titles; gboolean show_titles;
gboolean show_controls; gboolean show_controls;
@ -63,7 +62,6 @@ enum
PROP_SHADOW_TYPE, PROP_SHADOW_TYPE,
PROP_ACTION_GROUP, PROP_ACTION_GROUP,
PROP_MENU,
PROP_PAGE, PROP_PAGE,
PROP_SHOW_TITLES, PROP_SHOW_TITLES,
PROP_SHOW_CONTROLS, PROP_SHOW_CONTROLS,
@ -165,24 +163,6 @@ midori_panel_class_init (MidoriPanelClass* class)
GTK_TYPE_ACTION_GROUP, GTK_TYPE_ACTION_GROUP,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
* MidoriWebSettings:menu:
*
* This is the menu that holds the panel menu items.
*
* You shouldn't use this menu or add items.
*
* Deprecated: 0.1.9
*/
g_object_class_install_property (gobject_class,
PROP_MENU,
g_param_spec_object (
"menu",
"Menu",
"Menu to hold panel items",
GTK_TYPE_MENU,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_PAGE, PROP_PAGE,
g_param_spec_int ( g_param_spec_int (
@ -508,9 +488,6 @@ midori_panel_set_property (GObject* object,
case PROP_ACTION_GROUP: case PROP_ACTION_GROUP:
katze_object_assign (panel->action_group, g_value_dup_object (value)); katze_object_assign (panel->action_group, g_value_dup_object (value));
break; break;
case PROP_MENU:
katze_object_assign (panel->menu, g_value_dup_object (value));
break;
case PROP_PAGE: case PROP_PAGE:
midori_panel_set_current_page (panel, g_value_get_int (value)); midori_panel_set_current_page (panel, g_value_get_int (value));
break; break;
@ -556,9 +533,6 @@ midori_panel_get_property (GObject* object,
case PROP_ACTION_GROUP: case PROP_ACTION_GROUP:
g_value_set_object (value, panel->action_group); g_value_set_object (value, panel->action_group);
break; break;
case PROP_MENU:
g_value_set_object (value, panel->menu);
break;
case PROP_PAGE: case PROP_PAGE:
g_value_set_int (value, midori_panel_get_current_page (panel)); g_value_set_int (value, midori_panel_get_current_page (panel));
break; break;