From 58daa1a3f251f4d04783fb4ded9048ae919d83a7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 3 Apr 2006 01:41:38 +0000 Subject: [PATCH] Remove unused strings from the ruler_metrics structs, to avoid 2006-04-02 Matthias Clasen * gtk/gtkruler.c: Remove unused strings from the ruler_metrics structs, to avoid relocations. (#336917, Stephane Chauveau) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkruler.c | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56f35dd22e..59f13a92e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-02 Matthias Clasen + + * gtk/gtkruler.c: Remove unused strings from the ruler_metrics + structs, to avoid relocations. (#336917, Stephane Chauveau) + 2006-04-02 Emmanuele Bassi * gtk/gtkrecentmanager.c (gtk_recent_manager_set_filename): Build diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 56f35dd22e..59f13a92e0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-04-02 Matthias Clasen + + * gtk/gtkruler.c: Remove unused strings from the ruler_metrics + structs, to avoid relocations. (#336917, Stephane Chauveau) + 2006-04-02 Emmanuele Bassi * gtk/gtkrecentmanager.c (gtk_recent_manager_set_filename): Build diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 625b7787f3..ccc9b86be8 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -61,9 +61,9 @@ static GtkWidgetClass *parent_class; static const GtkRulerMetric ruler_metrics[] = { - {"Pixels", "Pi", 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {"Inches", "In", 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, - {"Centimeters", "Cn", 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, + { NULL, NULL, 1.0, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, + { NULL, NULL, 72.0, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, + { NULL, NULL, 28.35, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, };