AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert the previous change

Browse Source 
svn path=/trunk/; revision=22185
This commit is contained in:
Matthias Clasen 2009-01-23 01:45:46 +00:00
parent 7fde4a8542
commit 0b2554da86
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-01-22 Matthias Clasen <mnclasen@redhat.com>
* gtk/gtkaction.c: Revert the last change, since it breaks
epiphany.
2009-01-22 Federico Mena Quintero <federico@novell.com>
Fix the computation of "complete but unique" in

39
gtk/gtkaction.c
View File

@ -202,8 +202,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("The label used for menu items and buttons "
"that activate this action."),
NULL,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
/**
* GtkAction:short-label:
@ -216,8 +215,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("Short label"),
P_("A shorter label that may be used on toolbar buttons."),
NULL,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
@ -226,8 +224,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("Tooltip"),
P_("A tooltip for this action."),
NULL,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
/**
* GtkAction:stock-id:
@ -241,8 +238,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("The stock icon displayed in widgets representing "
"this action."),
NULL,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
/**
* GtkAction:gicon:
*
@ -259,8 +255,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("GIcon"),
P_("The GIcon being displayed"),
G_TYPE_ICON,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
/**
* GtkAction:icon-name:
*
@ -278,8 +273,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("Icon Name"),
P_("The name of the icon from the icon theme"),
NULL,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VISIBLE_HORIZONTAL,
@ -288,8 +282,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("Whether the toolbar item is visible when the toolbar "
"is in a horizontal orientation."),
TRUE,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
/**
* GtkAction:visible-overflown:
*
@ -305,8 +298,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("When TRUE, toolitem proxies for this action "
"are represented in the toolbar overflow menu."),
TRUE,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VISIBLE_VERTICAL,
g_param_spec_boolean ("visible-vertical",
@ -314,8 +306,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("Whether the toolbar item is visible when the toolbar "
"is in a vertical orientation."),
TRUE,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_IS_IMPORTANT,
g_param_spec_boolean ("is-important",
@ -324,32 +315,28 @@ gtk_action_class_init (GtkActionClass *klass)
"When TRUE, toolitem proxies for this action "
"show text in GTK_TOOLBAR_BOTH_HORIZ mode."),
FALSE,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HIDE_IF_EMPTY,
g_param_spec_boolean ("hide-if-empty",
P_("Hide if empty"),
P_("When TRUE, empty menu proxies for this action are hidden."),
TRUE,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SENSITIVE,
g_param_spec_boolean ("sensitive",
P_("Sensitive"),
P_("Whether the action is enabled."),
TRUE,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VISIBLE,
g_param_spec_boolean ("visible",
P_("Visible"),
P_("Whether the action is visible."),
TRUE,
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_ACTION_GROUP,
g_param_spec_object ("action-group",