summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--gdk/gdkwindow.c2
-rw-r--r--gtk/gtkactiongroup.c2
-rw-r--r--gtk/gtkcelleditable.c2
-rw-r--r--gtk/gtkcelllayout.c2
-rw-r--r--gtk/gtkclipboard-quartz.c2
-rw-r--r--gtk/gtkcontainer.c2
-rw-r--r--gtk/gtkcurve.c2
-rw-r--r--gtk/gtkeditable.c2
-rw-r--r--gtk/gtkfilechooserembed.c2
-rw-r--r--gtk/gtkfilesystem.c4
-rw-r--r--gtk/gtkiconview.c4
-rw-r--r--gtk/gtkobject.c2
-rw-r--r--gtk/gtkpagesetupunixdialog.c2
-rw-r--r--gtk/gtkprintoperationpreview.c2
-rw-r--r--gtk/gtkrecentchooserdefault.c5
-rw-r--r--gtk/gtkthemes.c2
-rw-r--r--gtk/gtktreednd.c4
-rw-r--r--gtk/gtktreemodel.c2
-rw-r--r--gtk/gtktreesortable.c2
-rw-r--r--gtk/gtkwindow.c2
21 files changed, 28 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index a3bb85a6ad..90973ed820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-10-03 Matthias Clasen <mclasen@redhat.com>
+ * gtk/*.c, gdk/*.c: Apply a patch by Behdad Esfahbod to
+ reduce relocations. (#359053)
+
+2006-10-03 Matthias Clasen <mclasen@redhat.com>
+
* modules/printbackends/cups/gtkprintbackendcups.c: Complete
the fix for bug 357280.
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 128b1c6aa7..048b3d59d7 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -218,7 +218,7 @@ _gdk_paintable_get_type (void)
if (!paintable_type)
{
- static const GTypeInfo paintable_info =
+ const GTypeInfo paintable_info =
{
sizeof (GdkPaintableIface), /* class_size */
NULL, /* base_init */
diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 98327dc6c7..70a45ee846 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -95,7 +95,7 @@ gtk_action_group_get_type (void)
if (!type)
{
- static const GTypeInfo type_info =
+ const GTypeInfo type_info =
{
sizeof (GtkActionGroupClass),
NULL, /* base_init */
diff --git a/gtk/gtkcelleditable.c b/gtk/gtkcelleditable.c
index e35b5c7672..0223022424 100644
--- a/gtk/gtkcelleditable.c
+++ b/gtk/gtkcelleditable.c
@@ -33,7 +33,7 @@ gtk_cell_editable_get_type (void)
if (! cell_editable_type)
{
- static const GTypeInfo cell_editable_info =
+ const GTypeInfo cell_editable_info =
{
sizeof (GtkCellEditableIface), /* class_size */
gtk_cell_editable_base_init, /* base_init */
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index 1fb7232aee..e866271a44 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -29,7 +29,7 @@ gtk_cell_layout_get_type (void)
if (! cell_layout_type)
{
- static const GTypeInfo cell_layout_info =
+ const GTypeInfo cell_layout_info =
{
sizeof (GtkCellLayoutIface),
NULL,
diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index 2922a4ccff..e86feeffa1 100644
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -152,7 +152,7 @@ gtk_clipboard_get_type (void)
if (!clipboard_type)
{
- static const GTypeInfo clipboard_info =
+ const GTypeInfo clipboard_info =
{
sizeof (GtkClipboardClass),
NULL, /* base_init */
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index e246b498fe..1d9181626f 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -120,7 +120,7 @@ gtk_container_get_type (void)
if (!container_type)
{
- static const GTypeInfo container_info =
+ const GTypeInfo container_info =
{
sizeof (GtkContainerClass),
(GBaseInitFunc) gtk_container_base_class_init,
diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index 6fbba7d6bd..469519a35e 100644
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -87,7 +87,7 @@ gtk_curve_get_type (void)
if (!curve_type)
{
- static const GTypeInfo curve_info =
+ const GTypeInfo curve_info =
{
sizeof (GtkCurveClass),
NULL, /* base_init */
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index 117dfcdadb..c3495a64de 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -43,7 +43,7 @@ gtk_editable_get_type (void)
if (!editable_type)
{
- static const GTypeInfo editable_info =
+ const GTypeInfo editable_info =
{
sizeof (GtkEditableClass), /* class_size */
gtk_editable_base_init, /* base_init */
diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
index 68415b459a..ab8d904083 100644
--- a/gtk/gtkfilechooserembed.c
+++ b/gtk/gtkfilechooserembed.c
@@ -141,7 +141,7 @@ _gtk_file_chooser_embed_get_type (void)
if (!file_chooser_embed_type)
{
- static const GTypeInfo file_chooser_embed_info =
+ const GTypeInfo file_chooser_embed_info =
{
sizeof (GtkFileChooserEmbedIface), /* class_size */
NULL, /* base_init */
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index ce256c1f4a..cf4f18fa73 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -402,7 +402,7 @@ gtk_file_system_get_type (void)
if (!file_system_type)
{
- static const GTypeInfo file_system_info =
+ const GTypeInfo file_system_info =
{
sizeof (GtkFileSystemIface), /* class_size */
gtk_file_system_base_init, /* base_init */
@@ -1031,7 +1031,7 @@ gtk_file_folder_get_type (void)
if (!file_folder_type)
{
- static const GTypeInfo file_folder_info =
+ const GTypeInfo file_folder_info =
{
sizeof (GtkFileFolderIface), /* class_size */
gtk_file_folder_base_init, /* base_init */
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index c7d4661aaf..2991ef5615 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8092,7 +8092,7 @@ gtk_icon_view_item_accessible_get_type (void)
if (!type)
{
- static const GTypeInfo tinfo =
+ const GTypeInfo tinfo =
{
sizeof (GtkIconViewItemAccessibleClass),
(GBaseInitFunc) NULL, /* base init */
@@ -9100,7 +9100,7 @@ gtk_icon_view_accessible_factory_get_type (void)
if (!type)
{
- static const GTypeInfo tinfo =
+ const GTypeInfo tinfo =
{
sizeof (AtkObjectFactoryClass),
NULL, /* base_init */
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 1b9d78215d..c21eefc320 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -82,7 +82,7 @@ gtk_object_get_type (void)
if (!object_type)
{
- static const GTypeInfo object_info =
+ const GTypeInfo object_info =
{
sizeof (GtkObjectClass),
(GBaseInitFunc) gtk_object_base_class_init,
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 4ff8da8bb2..4f45e711a8 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -126,7 +126,7 @@ static void printer_status_cb (GtkPrintBackend *backen
-static const gchar * const common_paper_sizes[] = {
+static const gchar const common_paper_sizes[][16] = {
"na_letter",
"na_legal",
"iso_a4",
diff --git a/gtk/gtkprintoperationpreview.c b/gtk/gtkprintoperationpreview.c
index 1861d81ddf..abfe9d32b8 100644
--- a/gtk/gtkprintoperationpreview.c
+++ b/gtk/gtkprintoperationpreview.c
@@ -35,7 +35,7 @@ gtk_print_operation_preview_get_type (void)
if (!print_operation_preview_type)
{
- static const GTypeInfo print_operation_preview_info =
+ const GTypeInfo print_operation_preview_info =
{
sizeof (GtkPrintOperationPreviewIface), /* class_size */
gtk_print_operation_preview_base_init, /* base_init */
diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index c56e1722c9..1a9f131480 100644
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -163,9 +163,6 @@ static const GtkTargetEntry recent_list_source_targets[] = {
{ "text/uri-list", 0, TEXT_URI_LIST }
};
-static const int num_recent_list_source_targets = (sizeof (recent_list_source_targets)
- / sizeof (recent_list_source_targets[0]));
-
/* Icon size for if we can't get it from the theme */
#define FALLBACK_ICON_SIZE 48
#define FALLBACK_ITEM_LIMIT 20
@@ -445,7 +442,7 @@ gtk_recent_chooser_default_constructor (GType type,
gtk_drag_source_set (impl->recent_view,
GDK_BUTTON1_MASK,
recent_list_source_targets,
- num_recent_list_source_targets,
+ G_N_ELEMENTS (recent_list_source_targets),
GDK_ACTION_COPY);
impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12);
diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index 7840935545..18559a81a7 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -137,7 +137,7 @@ gtk_theme_engine_get_type (void)
if (!theme_engine_type)
{
- static const GTypeInfo theme_engine_info = {
+ const GTypeInfo theme_engine_info = {
sizeof (GtkThemeEngineClass),
NULL, /* base_init */
NULL, /* base_finalize */
diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c
index 1f5d99d2f4..02cb54b43f 100644
--- a/gtk/gtktreednd.c
+++ b/gtk/gtktreednd.c
@@ -30,7 +30,7 @@ gtk_tree_drag_source_get_type (void)
if (!our_type)
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (GtkTreeDragSourceIface), /* class_size */
NULL, /* base_init */
@@ -59,7 +59,7 @@ gtk_tree_drag_dest_get_type (void)
if (!our_type)
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (GtkTreeDragDestIface), /* class_size */
NULL, /* base_init */
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 68ce31482b..a34e2af2ff 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -102,7 +102,7 @@ gtk_tree_model_get_type (void)
if (! tree_model_type)
{
- static const GTypeInfo tree_model_info =
+ const GTypeInfo tree_model_info =
{
sizeof (GtkTreeModelIface), /* class_size */
gtk_tree_model_base_init, /* base_init */
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index 4961e903af..1987d77972 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -33,7 +33,7 @@ gtk_tree_sortable_get_type (void)
if (! tree_sortable_type)
{
- static const GTypeInfo tree_sortable_info =
+ const GTypeInfo tree_sortable_info =
{
sizeof (GtkTreeSortableIface), /* class_size */
gtk_tree_sortable_base_init, /* base_init */
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b8a7c502c5..1da30202ee 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7022,7 +7022,7 @@ gtk_window_group_get_type (void)
if (!window_group_type)
{
- static const GTypeInfo window_group_info =
+ const GTypeInfo window_group_info =
{
sizeof (GtkWindowGroupClass),
NULL, /* base_init */
View Lorry Controller Status