diff -Nru gnome-control-center-3.4.2/debian/changelog gnome-control-center-3.4.2/debian/changelog --- gnome-control-center-3.4.2/debian/changelog 2012-09-07 09:08:27.000000000 -0400 +++ gnome-control-center-3.4.2/debian/changelog 2012-09-12 12:31:17.000000000 -0400 @@ -1,3 +1,12 @@ +gnome-control-center (1:3.4.2-0ubuntu15) quantal; urgency=low + + * debian/patches/git_fix_big_editable_labels.patch: + - Cherrypick from git to fix unconstrained font growth (LP: #1041756) + * debian/control.in: + - Bump gtk+3.0 build-deps to 3.5.13 for gtk_entry_set_attributes(). + + -- Jason Conti Sat, 08 Sep 2012 17:51:05 -0400 + gnome-control-center (1:3.4.2-0ubuntu14) quantal; urgency=low * debian/patches/power_cancellable_fixes.patch: diff -Nru gnome-control-center-3.4.2/debian/control gnome-control-center-3.4.2/debian/control --- gnome-control-center-3.4.2/debian/control 2012-09-07 09:08:33.000000000 -0400 +++ gnome-control-center-3.4.2/debian/control 2012-09-12 12:31:27.000000000 -0400 @@ -37,7 +37,7 @@ libgnomekbd-dev (>= 2.91.91), libgoa-1.0-dev (>= 3.5), libgstreamer-plugins-base0.10-dev, - libgtk-3-dev (>= 3.3.5), + libgtk-3-dev (>= 3.5.13), libgtop2-dev, libnm-glib-dev (>= 0.9) [linux-any], libnm-gtk-dev (>= 0.9) [linux-any], diff -Nru gnome-control-center-3.4.2/debian/control.in gnome-control-center-3.4.2/debian/control.in --- gnome-control-center-3.4.2/debian/control.in 2012-09-07 09:08:27.000000000 -0400 +++ gnome-control-center-3.4.2/debian/control.in 2012-09-12 12:31:01.000000000 -0400 @@ -33,7 +33,7 @@ libgnomekbd-dev (>= 2.91.91), libgoa-1.0-dev (>= 3.5), libgstreamer-plugins-base0.10-dev, - libgtk-3-dev (>= 3.3.5), + libgtk-3-dev (>= 3.5.13), libgtop2-dev, libnm-glib-dev (>= 0.9) [linux-any], libnm-gtk-dev (>= 0.9) [linux-any], diff -Nru gnome-control-center-3.4.2/debian/patches/git_fix_big_editable_labels.patch gnome-control-center-3.4.2/debian/patches/git_fix_big_editable_labels.patch --- gnome-control-center-3.4.2/debian/patches/git_fix_big_editable_labels.patch 1969-12-31 19:00:00.000000000 -0500 +++ gnome-control-center-3.4.2/debian/patches/git_fix_big_editable_labels.patch 2012-09-12 12:26:24.000000000 -0400 @@ -0,0 +1,86 @@ +From 41a79d6a35d18e9293fb6326cfac803d92b61f81 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Fri, 31 Aug 2012 15:10:45 -0400 +Subject: [PATCH] Fix big editable labels + +The code we used to match the entry and label font size and +weight broke down with the latest CSS improvements in GTK+. +Use a new GtkEntry api for this instead. +The GTK+ requirement has been bumped to 3.5.13. +--- + configure.ac | 2 +- + shell/cc-editable-entry.c | 36 +----------------------------------- + 2 files changed, 2 insertions(+), 36 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -75,7 +75,7 @@ + dnl ============================================== + + GLIB_REQUIRED_VERSION=2.31.0 +-GTK_REQUIRED_VERSION=3.3.5 ++GTK_REQUIRED_VERSION=3.5.13 + DESKTOP_SCHEMAS_REQUIRED_VERSION=3.0.2 + PA_REQUIRED_VERSION=0.9.16 + CANBERRA_REQUIRED_VERSION=0.13 +--- a/shell/cc-editable-entry.c ++++ b/shell/cc-editable-entry.c +@@ -147,38 +147,6 @@ + return e->priv->selectable; + } + +-static void +-update_entry_font (GtkWidget *widget, +- CcEditableEntry *e) +-{ +- CcEditableEntryPrivate *priv = e->priv; +- PangoFontDescription *desc; +- GtkStyleContext *style; +- gint size; +- +- if (!priv->weight_set && !priv->scale_set) +- return; +- +- g_signal_handlers_block_by_func (widget, update_entry_font, e); +- +- gtk_widget_override_font (widget, NULL); +- +- style = gtk_widget_get_style_context (widget); +- desc = pango_font_description_copy +- (gtk_style_context_get_font (style, gtk_widget_get_state_flags (widget))); +- +- if (priv->weight_set) +- pango_font_description_set_weight (desc, priv->weight); +- if (priv->scale_set) { +- size = pango_font_description_get_size (desc); +- pango_font_description_set_size (desc, priv->scale * size); +- } +- gtk_widget_override_font (widget, desc); +- +- pango_font_description_free (desc); +- +- g_signal_handlers_unblock_by_func (widget, update_entry_font, e); +-} + + static void + update_fonts (CcEditableEntry *e) +@@ -203,10 +171,9 @@ + + label = gtk_bin_get_child (GTK_BIN (priv->button)); + gtk_label_set_attributes (GTK_LABEL (label), attrs); ++ gtk_entry_set_attributes (priv->entry, attrs); + + pango_attr_list_unref (attrs); +- +- update_entry_font ((GtkWidget *)priv->entry, e); + } + + void +@@ -526,7 +493,6 @@ + g_signal_connect (priv->entry, "activate", G_CALLBACK (entry_activated), e); + g_signal_connect (priv->entry, "focus-out-event", G_CALLBACK (entry_focus_out), e); + g_signal_connect (priv->entry, "key-press-event", G_CALLBACK (entry_key_press), e); +- g_signal_connect (priv->entry, "style-updated", G_CALLBACK (update_entry_font), e); + g_signal_connect (gtk_bin_get_child (GTK_BIN (priv->button)), "size-allocate", G_CALLBACK (update_button_padding), e); + + gtk_container_add (GTK_CONTAINER (e), (GtkWidget*)priv->notebook); diff -Nru gnome-control-center-3.4.2/debian/patches/series gnome-control-center-3.4.2/debian/patches/series --- gnome-control-center-3.4.2/debian/patches/series 2012-09-07 09:08:27.000000000 -0400 +++ gnome-control-center-3.4.2/debian/patches/series 2012-09-12 12:26:24.000000000 -0400 @@ -44,3 +44,4 @@ git_update_keyring_password.patch git_update_mimetypes.patch power_cancellable_fixes.patch +git_fix_big_editable_labels.patch