[control-center] Rebase distro-logo.patch
Kalev Lember
kalev at fedoraproject.org
Wed Jul 23 20:37:01 UTC 2014
commit d25b10b120ae1831834187a7252b173a944c1507
Author: Kalev Lember <kalevlember at gmail.com>
Date: Wed Jul 23 22:33:42 2014 +0200
Rebase distro-logo.patch
distro-logo.patch | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/distro-logo.patch b/distro-logo.patch
index d751275..25e41a5 100644
--- a/distro-logo.patch
+++ b/distro-logo.patch
@@ -1,4 +1,4 @@
-From 5e18d79082c6f931ceab4c32c969749cf1d71c34 Mon Sep 17 00:00:00 2001
+From 12c6bf272242bff469627013ed1e566429b6a571 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Sun, 31 Mar 2013 20:28:19 -0400
Subject: [PATCH] info: Switch around GNOME and distro information
@@ -13,10 +13,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=695691
2 files changed, 121 insertions(+), 46 deletions(-)
diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
-index 1f79540..bfb83d8 100644
+index 9fba215..bc52c61 100644
--- a/panels/info/cc-info-panel.c
+++ b/panels/info/cc-info-panel.c
-@@ -492,48 +492,85 @@ cc_info_panel_class_init (CcInfoPanelClass *klass)
+@@ -432,48 +432,85 @@ cc_info_panel_class_init (CcInfoPanelClass *klass)
}
static char *
@@ -126,7 +126,7 @@ index 1f79540..bfb83d8 100644
return result;
}
-@@ -1555,6 +1592,11 @@ info_panel_setup_overview (CcInfoPanel *self)
+@@ -1499,6 +1536,11 @@ info_panel_setup_overview (CcInfoPanel *self)
gtk_label_set_text (GTK_LABEL (widget), text ? text : "");
g_free (text);
@@ -139,10 +139,10 @@ index 1f79540..bfb83d8 100644
widget = WID ("graphics_label");
diff --git a/panels/info/info.ui b/panels/info/info.ui
-index c7b193a..74f3c98 100644
+index 1967fdf..0bdfc1a 100644
--- a/panels/info/info.ui
+++ b/panels/info/info.ui
-@@ -237,13 +237,14 @@
+@@ -199,13 +199,14 @@
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -153,13 +153,13 @@ index c7b193a..74f3c98 100644
<object class="GtkImage" id="system_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
-- <property name="pixbuf">GnomeLogoVerticalMedium.svg</property>
+- <property name="resource">/org/gnome/control-center/info/GnomeLogoVerticalMedium.svg</property>
+ <property name="pixel_size">128</property>
+ <property name="icon_name">fedora-logo-icon</property>
</object>
<packing>
<property name="expand">False</property>
-@@ -252,11 +253,12 @@
+@@ -214,11 +215,12 @@
</packing>
</child>
<child>
@@ -173,7 +173,7 @@ index c7b193a..74f3c98 100644
<attributes>
<attribute name="scale" value="1.25"/>
</attributes>
-@@ -320,19 +322,35 @@
+@@ -282,19 +284,35 @@
</packing>
</child>
<child>
@@ -213,7 +213,7 @@ index c7b193a..74f3c98 100644
</packing>
</child>
<child>
-@@ -347,8 +365,8 @@
+@@ -309,8 +327,8 @@
</style>
</object>
<packing>
@@ -224,7 +224,7 @@ index c7b193a..74f3c98 100644
</packing>
</child>
<child>
-@@ -392,7 +410,7 @@
+@@ -354,7 +372,7 @@
</packing>
</child>
<child>
@@ -233,7 +233,7 @@ index c7b193a..74f3c98 100644
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
-@@ -402,8 +420,23 @@
+@@ -364,8 +382,23 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -259,7 +259,7 @@ index c7b193a..74f3c98 100644
</packing>
</child>
<child>
-@@ -417,8 +450,8 @@
+@@ -379,8 +412,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -270,7 +270,7 @@ index c7b193a..74f3c98 100644
</packing>
</child>
<child>
-@@ -500,8 +533,8 @@
+@@ -462,8 +495,8 @@
</style>
</object>
<packing>
@@ -281,7 +281,7 @@ index c7b193a..74f3c98 100644
</packing>
</child>
<child>
-@@ -529,8 +562,8 @@
+@@ -491,8 +524,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -292,7 +292,7 @@ index c7b193a..74f3c98 100644
</packing>
</child>
<child>
-@@ -548,8 +581,8 @@
+@@ -510,8 +543,8 @@
</style>
</object>
<packing>
@@ -303,7 +303,7 @@ index c7b193a..74f3c98 100644
</packing>
</child>
<child>
-@@ -563,8 +596,8 @@
+@@ -525,8 +558,8 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -315,5 +315,5 @@ index c7b193a..74f3c98 100644
</child>
</object>
--
-1.8.1.4
+2.0.1
More information about the scm-commits
mailing list