diff options
| -rw-r--r-- | data/empathy.schemas.in | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-cell-renderer-activatable.c | 3 | ||||
| -rw-r--r-- | src/empathy-preferences.ui | 8 |
3 files changed, 9 insertions, 6 deletions
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in index 6aa7f8a5f..faba263a5 100644 --- a/data/empathy.schemas.in +++ b/data/empathy.schemas.in @@ -22,9 +22,9 @@ <type>string</type> <default>name</default> <locale name="C"> - <short>Contact list sort criterium</short> + <short>Contact list sort criterion</short> <long> - Which criterium to use when sorting the contact list. + Which criterion to use when sorting the contact list. Default is to use sort by the contact's name with the value "name". A value of "state" will sort the contact list by state. </long> diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c index 29393f14c..b0e226091 100644 --- a/libempathy-gtk/empathy-cell-renderer-activatable.c +++ b/libempathy-gtk/empathy-cell-renderer-activatable.c @@ -240,6 +240,9 @@ cell_renderer_activatable_render ( !gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) return; + if (pixbuf == NULL) + return; + if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE || !cell->sensitive) { GtkIconSource *source; diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui index 1e3a42580..2e32fe9dd 100644 --- a/src/empathy-preferences.ui +++ b/src/empathy-preferences.ui @@ -501,7 +501,7 @@ <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="checkbutton_location_resource_gps"> - <property name="label" translatable="yes">Allow _GPS usage</property> + <property name="label" translatable="yes">_GPS</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -516,7 +516,7 @@ </child> <child> <object class="GtkCheckButton" id="checkbutton_location_resource_cell"> - <property name="label" translatable="yes">Allow _cellphone usage</property> + <property name="label" translatable="yes">_Cellphone</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -532,7 +532,7 @@ </child> <child> <object class="GtkCheckButton" id="checkbutton_location_resource_network"> - <property name="label" translatable="yes">Allow _network usage</property> + <property name="label" translatable="yes">_Network (IP, Wifi)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -553,7 +553,7 @@ <child type="label"> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="label" translatable="yes">Geoclue Settings</property> + <property name="label" translatable="yes">Location sources:</property> <attributes> <attribute name="weight" value="bold"/> </attributes> |