small formatting fix.

[~andy/gtk] / gtk / gtktoolitem.c

diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index c6cbb8e776a87b15286ab5e8c6315115f2f698a8..2d73c228e030f08b40e58c6a4d4b3c2352fb76b1 100644 (file)
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -20,7 +20,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include <string.h>
+
+#undef GTK_DISABLE_DEPRECATED /* GtkTooltips */
+
 #include "gtktoolitem.h"
 #include "gtkmarshalers.h"
 #include "gtktoolshell.h"
@@ -30,8 +35,6 @@
 #include "gtkprivate.h"
 #include "gtkalias.h"
 
-#include <string.h>
-
 /**
  * SECTION:gtktoolitem
  * @short_description: The base class of widgets that can be added to #GtkToolShell
@@ -199,7 +202,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
  * Return value: %TRUE if the signal was handled, %FALSE if not
  **/
   toolitem_signals[CREATE_MENU_PROXY] =
-    g_signal_new (I_("create_menu_proxy"),
+    g_signal_new (I_("create-menu-proxy"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkToolItemClass, create_menu_proxy),
@@ -224,7 +227,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
  * themselves accordingly.
  **/
   toolitem_signals[TOOLBAR_RECONFIGURED] =
-    g_signal_new (I_("toolbar_reconfigured"),
+    g_signal_new (I_("toolbar-reconfigured"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkToolItemClass, toolbar_reconfigured),
@@ -248,7 +251,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
  *   need to use this signal anymore.
  **/
   toolitem_signals[SET_TOOLTIP] =
-    g_signal_new (I_("set_tooltip"),
+    g_signal_new (I_("set-tooltip"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkToolItemClass, set_tooltip),
@@ -281,12 +284,11 @@ gtk_tool_item_finalize (GObject *object)
   GtkToolItem *item = GTK_TOOL_ITEM (object);
 
   g_free (item->priv->menu_item_id);
-  
+
   if (item->priv->menu_item)
     g_object_unref (item->priv->menu_item);
-  
-  if (G_OBJECT_CLASS (gtk_tool_item_parent_class)->finalize)
-    G_OBJECT_CLASS (gtk_tool_item_parent_class)->finalize (object);
+
+  G_OBJECT_CLASS (gtk_tool_item_parent_class)->finalize (object);
 }
 
 static void
@@ -1174,7 +1176,7 @@ gtk_tool_item_set_proxy_menu_item (GtkToolItem *tool_item,
  * #GtkToolbar and other #GtkToolShell implementations use this function
  * to notify children, when some aspect of their configuration changes.
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 void
 gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item)