gdm r5926 - in trunk: . gui/simple-greeter
- From: halfline svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r5926 - in trunk: . gui/simple-greeter
- Date: Wed, 5 Mar 2008 05:18:34 +0000 (GMT)
Author: halfline
Date: Wed Mar 5 05:18:34 2008
New Revision: 5926
URL: http://svn.gnome.org/viewvc/gdm?rev=5926&view=rev
Log:
2008-03-04 Ray Strode <rstrode redhat com>
* gui/simple-greeter/gdm-chooser-widget.c:
(GdmChooserWidgetPrivate), (update_column_visibility),
(gdm_chooser_widget_init), (gdm_chooser_widget_update_item),
(gdm_chooser_widget_add_item), (gdm_chooser_widget_remove_item),
(gdm_chooser_widget_set_item_in_use):
rename in_use_column and number_of_in_use_rows to status_column
and number_of_rows_with_status respectively, in preparation for
packing the animated timer into the same status column
Modified:
trunk/ChangeLog
trunk/gui/simple-greeter/gdm-chooser-widget.c
Modified: trunk/gui/simple-greeter/gdm-chooser-widget.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-chooser-widget.c (original)
+++ trunk/gui/simple-greeter/gdm-chooser-widget.c Wed Mar 5 05:18:34 2008
@@ -68,7 +68,7 @@
GtkTreeRowReference *top_edge_row; /* Only around for shrink */
GtkTreeRowReference *bottom_edge_row; /* animations */
- GtkTreeViewColumn *is_in_use_column;
+ GtkTreeViewColumn *status_column;
GtkTreeViewColumn *image_column;
char *inactive_text;
@@ -77,7 +77,7 @@
gint number_of_normal_rows;
gint number_of_separated_rows;
- gint number_of_in_use_rows;
+ gint number_of_rows_with_status;
gint number_of_rows_with_images;
guint update_idle_id;
@@ -1434,13 +1434,14 @@
gtk_tree_view_column_set_visible (widget->priv->image_column,
FALSE);
}
- if (widget->priv->number_of_in_use_rows > 0) {
- gtk_tree_view_column_set_visible (widget->priv->is_in_use_column,
+ if (widget->priv->number_of_rows_with_status > 0) {
+ gtk_tree_view_column_set_visible (widget->priv->status_column,
TRUE);
} else {
- gtk_tree_view_column_set_visible (widget->priv->is_in_use_column,
+ gtk_tree_view_column_set_visible (widget->priv->status_column,
FALSE);
}
+
return FALSE;
}
@@ -1619,12 +1620,12 @@
gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (widget->priv->items_view),
CHOOSER_COMMENT_COLUMN);
- /* IN USE COLUMN */
+ /* STATUS COLUMN */
renderer = gtk_cell_renderer_pixbuf_new ();
column = gtk_tree_view_column_new ();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_append_column (GTK_TREE_VIEW (widget->priv->items_view), column);
- widget->priv->is_in_use_column = column;
+ widget->priv->status_column = column;
gtk_tree_view_column_set_cell_data_func (column,
renderer,
@@ -1717,9 +1718,9 @@
if (in_use != new_in_use) {
if (new_in_use) {
- widget->priv->number_of_in_use_rows++;
+ widget->priv->number_of_rows_with_status++;
} else {
- widget->priv->number_of_in_use_rows--;
+ widget->priv->number_of_rows_with_status--;
}
queue_column_visibility_update (widget);
}
@@ -1766,7 +1767,7 @@
}
if (in_use) {
- widget->priv->number_of_in_use_rows++;
+ widget->priv->number_of_rows_with_status++;
queue_column_visibility_update (widget);
}
@@ -1824,7 +1825,7 @@
}
if (is_in_use) {
- widget->priv->number_of_in_use_rows--;
+ widget->priv->number_of_rows_with_status--;
queue_column_visibility_update (widget);
}
@@ -1898,9 +1899,9 @@
if (was_in_use != is_in_use) {
if (is_in_use) {
- widget->priv->number_of_in_use_rows++;
+ widget->priv->number_of_rows_with_status++;
} else {
- widget->priv->number_of_in_use_rows--;
+ widget->priv->number_of_rows_with_status--;
}
queue_column_visibility_update (widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]