[gnome-control-center] info: Remove "Chat" preferred app setting
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] info: Remove "Chat" preferred app setting
- Date: Fri, 18 Feb 2011 21:10:32 +0000 (UTC)
commit dd25d61fdca6a4eb5e98e6efddab69b0d0fed231
Author: Bastien Nocera <hadess hadess net>
Date: Fri Feb 18 21:09:49 2011 +0000
info: Remove "Chat" preferred app setting
We only really support Telepathy-based clients, so no
point in giving a choice here.
panels/info/cc-info-panel.c | 9 ++----
panels/info/info.ui | 56 +++++++++++++-----------------------------
2 files changed, 21 insertions(+), 44 deletions(-)
---
diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
index e81096f..55a71a3 100644
--- a/panels/info/cc-info-panel.c
+++ b/panels/info/cc-info-panel.c
@@ -896,17 +896,14 @@ info_panel_setup_default_apps (CcInfoPanel *self)
info_panel_setup_default_app (self, "text/calendar",
1, 2, 2, 3);
- info_panel_setup_default_app (self, "x-scheme-handler/xmpp",
- 1, 2, 3, 4);
-
info_panel_setup_default_app (self, "audio/x-vorbis+ogg",
- 1, 2, 4, 5);
+ 1, 2, 3, 4);
info_panel_setup_default_app (self, "video/x-ogm+ogg",
- 1, 2, 5, 6);
+ 1, 2, 4, 5);
info_panel_setup_default_app (self, "image/jpeg",
- 1, 2, 6, 7);
+ 1, 2, 5, 6);
}
static void
diff --git a/panels/info/info.ui b/panels/info/info.ui
index bb5ebf5..719d5ca 100644
--- a/panels/info/info.ui
+++ b/panels/info/info.ui
@@ -396,7 +396,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="n_rows">7</property>
+ <property name="n_rows">6</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">12</property>
@@ -440,8 +440,8 @@
<property name="label" translatable="yes">Music</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
@@ -452,8 +452,8 @@
<property name="label" translatable="yes">Video</property>
</object>
<packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
<child>
@@ -505,8 +505,8 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -519,25 +519,25 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label30">
+ <object class="GtkLabel" id="label32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Chat</property>
+ <property name="label" translatable="yes">Photos</property>
</object>
<packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label31">
+ <object class="GtkLabel" id="label33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"> </property>
@@ -545,36 +545,16 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Photos</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
+ <placeholder/>
</child>
<child>
- <object class="GtkLabel" id="label33">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"> </property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
+ <placeholder/>
</child>
<child>
<placeholder/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
