[gnome-software] Do not use the deprecated gtk_widget_set_margin_left()
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Do not use the deprecated gtk_widget_set_margin_left()
- Date: Tue, 26 Nov 2013 08:23:39 +0000 (UTC)
commit b3b9cb717b171e82068490f087285c1f6289a308
Author: Richard Hughes <richard hughsie com>
Date: Mon Nov 25 09:52:29 2013 +0000
Do not use the deprecated gtk_widget_set_margin_left()
configure.ac | 2 +-
src/app-widget.ui | 10 +++++-----
src/gnome-software.ui | 42 +++++++++++++++++++++---------------------
src/gs-app-folder-dialog.c | 16 ++++++++--------
src/gs-app-widget.c | 4 ++--
5 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d4891ae..0426da6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ GLIB_GSETTINGS
dnl ---------------------------------------------------------------------------
dnl - Check library dependencies
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.9.12 gio-unix-2.0)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.11.2 gio-unix-2.0)
PKG_CHECK_MODULES(PACKAGEKIT, packagekit-glib2 >= 0.8.12)
PKG_CHECK_MODULES(SQLITE, sqlite3)
PKG_CHECK_MODULES(NOTIFY, libnotify)
diff --git a/src/app-widget.ui b/src/app-widget.ui
index 2a3ec92..b6d4963 100644
--- a/src/app-widget.ui
+++ b/src/app-widget.ui
@@ -107,7 +107,7 @@
<property name="valign">center</property>
<child>
<object class="GtkButton" id="button">
- <property name="margin_right">9</property>
+ <property name="margin_end">9</property>
<property name="width_request">100</property>
<property name="halign">end</property>
</object>
@@ -119,8 +119,8 @@
</child>
<child>
<object class="GtkSpinner" id="spinner">
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
+ <property name="margin_start">6</property>
+ <property name="margin_end">6</property>
<property name="halign">end</property>
</object>
<packing>
@@ -131,8 +131,8 @@
</child>
<child>
<object class="GtkLabel" id="label">
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
+ <property name="margin_start">6</property>
+ <property name="margin_end">6</property>
<property name="halign">end</property>
</object>
<packing>
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index 57f2f9f..dec9729 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -446,8 +446,8 @@
<object class="GtkAlignment" id="bin_featured">
<property name="visible">True</property>
<property name="halign">fill</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_start">12</property>
+ <property name="margin_end">12</property>
<accessibility>
<relation target="featured_heading" type="labelled-by"/>
</accessibility>
@@ -485,8 +485,8 @@
<object class="GtkBox" id="box_popular">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_start">12</property>
+ <property name="margin_end">12</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
<property name="valign">start</property>
@@ -527,8 +527,8 @@
<object class="GtkGrid" id="grid_categories">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_start">12</property>
+ <property name="margin_end">12</property>
<property name="margin-bottom">24</property>
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
@@ -905,8 +905,8 @@
<property name="halign">center</property>
<property name="margin_top">28</property>
<property name="margin_bottom">28</property>
- <property name="margin_left">64</property>
- <property name="margin_right">64</property>
+ <property name="margin_start">64</property>
+ <property name="margin_end">64</property>
<property name="hexpand">False</property>
<child>
<object class="GtkBox" id="box_details_header">
@@ -942,8 +942,8 @@
<property name="halign">start</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
- <property name="margin_left">24</property>
- <property name="margin_right">24</property>
+ <property name="margin_start">24</property>
+ <property name="margin_end">24</property>
<property name="margin_bottom">12</property>
<property name="xalign">0</property>
<property name="selectable">True</property>
@@ -964,8 +964,8 @@
<property name="halign">start</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
- <property name="margin_left">24</property>
- <property name="margin_right">24</property>
+ <property name="margin_start">24</property>
+ <property name="margin_end">24</property>
<property name="margin_bottom">28</property>
<property name="xalign">0</property>
<property name="selectable">True</property>
@@ -1254,7 +1254,7 @@
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Licence</property>
- <property name="margin_left">42</property>
+ <property name="margin_start">42</property>
<style>
<class name="dim-label"/>
</style>
@@ -1291,7 +1291,7 @@
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Size</property>
- <property name="margin_left">42</property>
+ <property name="margin_start">42</property>
<style>
<class name="dim-label"/>
</style>
@@ -1327,7 +1327,7 @@
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Developer</property>
- <property name="margin_left">42</property>
+ <property name="margin_start">42</property>
<style>
<class name="dim-label"/>
</style>
@@ -1428,8 +1428,8 @@
<property name="can_focus">False</property>
<child>
<object class="GtkGrid" id="category_detail_grid">
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_start">12</property>
+ <property name="margin_end">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="halign">fill</property>
@@ -1478,8 +1478,8 @@
<object class="GtkBox" id="dialog-vbox2">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
+ <property name="margin_start">6</property>
+ <property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property>
@@ -1557,8 +1557,8 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
- <property name="margin_left">6</property>
- <property name="margin_right">6</property>
+ <property name="margin_start">6</property>
+ <property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property>
diff --git a/src/gs-app-folder-dialog.c b/src/gs-app-folder-dialog.c
index 08598f1..30fcd57 100644
--- a/src/gs-app-folder-dialog.c
+++ b/src/gs-app-folder-dialog.c
@@ -128,8 +128,8 @@ done_editing (GtkEntry *entry, GsAppFolderDialog *dialog)
label = gtk_label_new (folder);
gtk_widget_show (label);
- gtk_widget_set_margin_left (label, 10);
- gtk_widget_set_margin_right (label, 10);
+ gtk_widget_set_margin_start (label, 10);
+ gtk_widget_set_margin_end (label, 10);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -151,8 +151,8 @@ new_folder_cb (GsAppFolderDialog *dialog)
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
entry = gtk_entry_new ();
- gtk_widget_set_margin_left (entry, 10);
- gtk_widget_set_margin_right (entry, 10);
+ gtk_widget_set_margin_start (entry, 10);
+ gtk_widget_set_margin_end (entry, 10);
gtk_widget_set_halign (entry, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
@@ -244,8 +244,8 @@ create_row (GsAppFolderDialog *dialog, const gchar *folder)
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new (gs_folders_get_folder_name (priv->folders, folder));
- gtk_widget_set_margin_left (label, 10);
- gtk_widget_set_margin_right (label, 10);
+ gtk_widget_set_margin_start (label, 10);
+ gtk_widget_set_margin_end (label, 10);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
@@ -264,8 +264,8 @@ create_row (GsAppFolderDialog *dialog, const gchar *folder)
}
if (s->len > 0) {
label = gtk_label_new (s->str);
- gtk_widget_set_margin_left (label, 10);
- gtk_widget_set_margin_right (label, 10);
+ gtk_widget_set_margin_start (label, 10);
+ gtk_widget_set_margin_end (label, 10);
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_max_width_chars (GTK_LABEL (label), 30);
gtk_widget_set_halign (label, GTK_ALIGN_END);
diff --git a/src/gs-app-widget.c b/src/gs-app-widget.c
index 9662853..fff84c6 100644
--- a/src/gs-app-widget.c
+++ b/src/gs-app-widget.c
@@ -124,11 +124,11 @@ gs_app_widget_refresh (GsAppWidget *app_widget)
switch (gs_app_get_kind (priv->app)) {
case GS_APP_KIND_MISSING:
gtk_widget_set_visible (priv->name_box, FALSE);
- gtk_widget_set_margin_right (priv->description_label, 250);
+ gtk_widget_set_margin_end (priv->description_label, 250);
break;
default:
gtk_widget_set_visible (priv->name_box, TRUE);
- gtk_widget_set_margin_right (priv->description_label, 0);
+ gtk_widget_set_margin_end (priv->description_label, 0);
}
/* join the lines*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
