callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'places-sidebar'

Browse Source
This commit is contained in:
Federico Mena Quintero
2013-04-23 13:58:09 -04:00
parent 8ca13c4679 0c1423d962
commit d9b9ba5da0
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/glade/gtk-private-widgets.xml
View File

@ -20,7 +20,6 @@
<property id="size" disabled="True"/> <property id="size" disabled="True"/>
</properties> </properties>
</glade-widget-class> </glade-widget-class>
<glade-widget-class name="GtkPlacesSidebar" generic-name="placessidebar" title="Places Sidebar"/>
</glade-widget-classes> </glade-widget-classes>
<glade-widget-group name="gtk-private" title="Private GTK+ Classes"> <glade-widget-group name="gtk-private" title="Private GTK+ Classes">
@ -30,6 +29,5 @@
<glade-widget-class-ref name="GtkColorScale"/> <glade-widget-class-ref name="GtkColorScale"/>
<glade-widget-class-ref name="GtkScaleButtonScale"/> <glade-widget-class-ref name="GtkScaleButtonScale"/>
<glade-widget-class-ref name="GtkPrinterOptionWidget"/> <glade-widget-class-ref name="GtkPrinterOptionWidget"/>
<glade-widget-class-ref name="GtkPlacesSidebar"/>
</glade-widget-group> </glade-widget-group>
</glade-catalog> </glade-catalog>

12
gtk/gtkplacessidebar.c
View File

@ -4174,26 +4174,26 @@ gtk_places_sidebar_class_init (GtkPlacesSidebarClass *class)
properties[PROP_LOCATION] = properties[PROP_LOCATION] =
g_param_spec_object ("location", g_param_spec_object ("location",
P_("Location to select"), P_("Location to Select"),
P_("The location to highlight in the sidebar"), P_("The location to highlight in the sidebar"),
G_TYPE_FILE, G_TYPE_FILE,
G_PARAM_READWRITE); G_PARAM_READWRITE);
properties[PROP_OPEN_FLAGS] = properties[PROP_OPEN_FLAGS] =
g_param_spec_flags ("open-flags", g_param_spec_flags ("open-flags",
P_("The open modes supported for this widget"), P_("Open Flags"),
P_("The set of open modes supported for this widget"), P_("Modes in which the calling application can open locations selected in the sidebar"),
GTK_TYPE_PLACES_OPEN_FLAGS, GTK_TYPE_PLACES_OPEN_FLAGS,
GTK_PLACES_OPEN_NORMAL, GTK_PLACES_OPEN_NORMAL,
G_PARAM_READWRITE); G_PARAM_READWRITE);
properties[PROP_SHOW_DESKTOP] = properties[PROP_SHOW_DESKTOP] =
g_param_spec_boolean ("show-desktop", g_param_spec_boolean ("show-desktop",
P_("Whether to show desktop"), P_("Show 'Desktop'"),
P_("Whether the sidebar includes a builtin shortcut to the desktop folder"), P_("Whether the sidebar includes a builtin shortcut to the Desktop folder"),
FALSE, FALSE,
G_PARAM_READWRITE); G_PARAM_READWRITE);
properties[PROP_SHOW_CONNECT_TO_SERVER] = properties[PROP_SHOW_CONNECT_TO_SERVER] =
g_param_spec_boolean ("show-connect-to-server", g_param_spec_boolean ("show-connect-to-server",
P_("Whether to show connect to server"), P_("Show 'Connect to Server'"),
P_("Whether the sidebar includes a builtin shortcut to a 'Connect to server' dialog"), P_("Whether the sidebar includes a builtin shortcut to a 'Connect to server' dialog"),
FALSE, FALSE,
G_PARAM_READWRITE); G_PARAM_READWRITE);