diff --git a/midori/midori-app.c b/midori/midori-app.c index d4cfd16b..52148978 100644 --- a/midori/midori-app.c +++ b/midori/midori-app.c @@ -96,8 +96,7 @@ enum PROP_HISTORY, PROP_EXTENSIONS, PROP_BROWSERS, - PROP_BROWSER, - PROP_BROWSER_COUNT + PROP_BROWSER }; enum { @@ -394,22 +393,6 @@ midori_app_class_init (MidoriAppClass* class) "The current browser", MIDORI_TYPE_BROWSER, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - - /** - * MidoriApp:browser-count: - * - * The number of browsers. - * - * Deprecated: 0.1.3 Use MidoriApp:browsers instead. - */ - g_object_class_install_property (gobject_class, - PROP_BROWSER_COUNT, - g_param_spec_uint ( - "browser-count", - "Browser Count", - "The current number of browsers", - 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); } static void @@ -858,9 +841,6 @@ midori_app_get_property (GObject* object, case PROP_BROWSER: g_value_set_object (value, app->browser); break; - case PROP_BROWSER_COUNT: - g_value_set_uint (value, katze_array_get_length (app->browsers)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 9747b342..07ecfff1 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -570,23 +570,6 @@ midori_panel_new (void) return GTK_WIDGET (panel); } -/** - * midori_panel_set_compact: - * @compact: %TRUE if the panel should be compact - * - * Determines if the panel should be compact. - * - * Deprecated: 0.1.9 - **/ -void -midori_panel_set_compact (MidoriPanel* panel, - gboolean compact) -{ - g_return_if_fail (MIDORI_IS_PANEL (panel)); - - g_object_set (panel, "show-titles", !compact, NULL); -} - /** * midori_panel_set_right_aligned: * @right_aligned: %TRUE if the panel should be aligned to the right diff --git a/midori/midori-panel.h b/midori/midori-panel.h index d9a1fe19..87166674 100644 --- a/midori/midori-panel.h +++ b/midori/midori-panel.h @@ -42,10 +42,6 @@ midori_panel_get_type (void) G_GNUC_CONST; GtkWidget* midori_panel_new (void); -void -midori_panel_set_compact (MidoriPanel* panel, - gboolean compact); - void midori_panel_set_right_aligned (MidoriPanel* panel, gboolean right_aligned); diff --git a/panels/midori-console.c b/panels/midori-console.c index b70cf11a..922d9e34 100644 --- a/panels/midori-console.c +++ b/panels/midori-console.c @@ -59,6 +59,9 @@ midori_console_get_property (GObject* object, GValue* value, GParamSpec* pspec); +static GtkWidget* +midori_console_get_toolbar (MidoriViewable* console); + static void midori_console_class_init (MidoriConsoleClass* class) { @@ -327,22 +330,9 @@ midori_console_new (void) return GTK_WIDGET (console); } -/** - * midori_console_get_toolbar: - * @console: a #MidoriConsole - * - * Retrieves the toolbar of the console. A new widget is created on - * the first call of this function. - * - * Return value: a toolbar widget - * - * Deprecated: 0.1.2: Use midori_viewable_get_toolbar() instead. - **/ -GtkWidget* +static GtkWidget* midori_console_get_toolbar (MidoriViewable* console) { - g_return_val_if_fail (MIDORI_IS_CONSOLE (console), NULL); - if (!MIDORI_CONSOLE (console)->toolbar) { GtkWidget* toolbar; diff --git a/panels/midori-console.h b/panels/midori-console.h index 011837dc..b3fa760c 100644 --- a/panels/midori-console.h +++ b/panels/midori-console.h @@ -42,9 +42,6 @@ midori_console_get_type (void); GtkWidget* midori_console_new (void); -GtkWidget* -midori_console_get_toolbar (MidoriViewable* console); - void midori_console_add (MidoriConsole* console, const gchar* message,