applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

info: remove the use of the deprecated GtkTable class

Browse source 
GtkTable was deprecated in GTK+ 3.4.

https://bugzilla.gnome.org/show_bug.cgi?id=688254
This commit is contained in:
Thomas Wood 2012-11-13 14:08:41 +00:00
parent 7dab589e9e
commit 6528b4d789
2 changed files with 13 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
panels/info/cc-info-panel.c
View file

@ -978,23 +978,20 @@ static void
info_panel_setup_default_app (CcInfoPanel *self,
DefaultAppData *data,
guint left_attach,
guint right_attach,
guint top_attach,
guint bottom_attach)
guint top_attach)
{
GtkWidget *button;
GtkWidget *table;
GtkWidget *grid;
GtkWidget *label;
table = WID ("default_apps_table");
grid = WID ("default_apps_grid");
button = gtk_app_chooser_button_new (data->content_type);
g_object_set_data (G_OBJECT (button), "cc-default-app-data", data);
gtk_app_chooser_button_set_show_default_item (GTK_APP_CHOOSER_BUTTON (button), TRUE);
gtk_table_attach (GTK_TABLE (table), button,
left_attach, right_attach,
top_attach, bottom_attach, GTK_FILL, 0, 0, 0);
gtk_grid_attach (GTK_GRID (grid), button, left_attach, top_attach,
1, 1);
g_signal_connect (G_OBJECT (button), "changed",
G_CALLBACK (default_app_changed), self);
gtk_widget_show (button);
@ -1024,7 +1021,7 @@ info_panel_setup_default_apps (CcInfoPanel *self)
for (i = 0; i < G_N_ELEMENTS(preferred_app_infos); i++)
{
info_panel_setup_default_app (self, &preferred_app_infos[i],
1, 2, i, i+1);
1, i);
}
}

34
panels/info/info.ui
View file

@ -627,13 +627,9 @@
<property name="spacing">10</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkTable" id="default_apps_table">
<object class="GtkGrid" id="default_apps_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</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>
<child>
@ -661,7 +657,7 @@
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
@ -677,7 +673,7 @@
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
@ -693,7 +689,7 @@
</object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
@ -709,7 +705,7 @@
</object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
@ -720,8 +716,7 @@
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -732,10 +727,7 @@
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -746,10 +738,7 @@
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -760,10 +749,7 @@
</object>
<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="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -774,10 +760,7 @@
</object>
<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="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@ -793,7 +776,7 @@
</object>
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="left_attach">0</property>
</packing>
</child>
<child>
@ -804,10 +787,7 @@
</object>
<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="x_options">GTK_FILL</property>
</packing>
</child>
<child>