[Xfce4-commits] <midori:master> Remove browser-count, midori_panel_set_compact, console toolbar

[Christian Dywan]

Updating branch refs/heads/master
         to 1b80f16bf4f0c59cd7cf95119334c246cde4c4f5 (commit)
       from 38d75adc28c30a3e102eb0597e530dd7b66c9356 (commit)

commit 1b80f16bf4f0c59cd7cf95119334c246cde4c4f5
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Sep 7 22:24:11 2010 +0200

    Remove browser-count, midori_panel_set_compact, console toolbar

 midori/midori-app.c     |   22 +---------------------
 midori/midori-panel.c   |   17 -----------------
 midori/midori-panel.h   |    4 ----
 panels/midori-console.c |   18 ++++--------------
 panels/midori-console.h |    3 ---
 5 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/midori/midori-app.c b/midori/midori-app.c
index d4cfd16..5214897 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 9747b34..07ecfff 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -571,23 +571,6 @@ midori_panel_new (void)
 }
 
 /**
- * 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 d9a1fe1..8716667 100644
--- a/midori/midori-panel.h
+++ b/midori/midori-panel.h
@@ -43,10 +43,6 @@ 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 b70cf11..922d9e3 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 011837d..b3fa760 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,