summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@svn.gnome.org>2007-01-18 12:26:35 +0000
committerChristian Persch <chpe@src.gnome.org>2007-01-18 12:26:35 +0000
commiteb26edd25e6b1ff40dc8167e89329eb211aa3e20 (patch)
tree7e8f63f8bdad5f3d348164dbaf5e683e966151b2
parent2962c56d4810d2c78c322b52c86d1019c8aca69b (diff)
downloadnautilus-eb26edd25e6b1ff40dc8167e89329eb211aa3e20.tar.gz
No need to make GTypeInfo and GInterfaceInfo static. Bug #362034.
2007-01-18 Christian Persch <chpe@svn.gnome.org> * cut-n-paste-code/libegg/eggtreemultidnd.c: (egg_tree_multi_drag_source_get_type): * libnautilus-extension/nautilus-column-provider.c: (nautilus_column_provider_get_type): * libnautilus-extension/nautilus-column.c: (nautilus_column_get_type): * libnautilus-extension/nautilus-file-info.c: (nautilus_file_info_get_type): * libnautilus-extension/nautilus-info-provider.c: (nautilus_info_provider_get_type): * libnautilus-extension/nautilus-location-widget-provider.c: (nautilus_location_widget_provider_get_type): * libnautilus-extension/nautilus-menu-item.c: (nautilus_menu_item_get_type): * libnautilus-extension/nautilus-menu-provider.c: (nautilus_menu_provider_get_type): * libnautilus-extension/nautilus-menu.c: (nautilus_menu_get_type): * libnautilus-extension/nautilus-property-page-provider.c: (nautilus_property_page_provider_get_type): * libnautilus-extension/nautilus-property-page.c: (nautilus_property_page_get_type): * libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c: (nautilus_cell_renderer_pixbuf_emblem_get_type): * libnautilus-private/nautilus-entry.c: (nautilus_entry_get_type): * libnautilus-private/nautilus-file.c: (nautilus_file_get_type): * libnautilus-private/nautilus-icon-canvas-item.c: (nautilus_icon_canvas_item_accessible_get_type), (nautilus_icon_canvas_item_get_type): * libnautilus-private/nautilus-sidebar-provider.c: (nautilus_sidebar_provider_get_type): * libnautilus-private/nautilus-sidebar.c: (nautilus_sidebar_get_type): * libnautilus-private/nautilus-view.c: (nautilus_view_get_type): * libnautilus-private/nautilus-window-info.c: (nautilus_window_info_get_type): * src/file-manager/fm-ditem-page.c: (fm_ditem_page_get_type): * src/file-manager/fm-list-model.c: (fm_list_model_get_type): * src/file-manager/fm-tree-model.c: (fm_tree_model_get_type): * src/nautilus-navigation-action.c: (nautilus_navigation_action_get_type): No need to make GTypeInfo and GInterfaceInfo static. Bug #362034. svn path=/trunk/; revision=12700
-rw-r--r--ChangeLog44
-rw-r--r--cut-n-paste-code/libegg/eggtreemultidnd.c2
-rw-r--r--libnautilus-extension/nautilus-column-provider.c2
-rw-r--r--libnautilus-extension/nautilus-column.c2
-rw-r--r--libnautilus-extension/nautilus-file-info.c2
-rw-r--r--libnautilus-extension/nautilus-info-provider.c2
-rw-r--r--libnautilus-extension/nautilus-location-widget-provider.c2
-rw-r--r--libnautilus-extension/nautilus-menu-item.c2
-rw-r--r--libnautilus-extension/nautilus-menu-provider.c2
-rw-r--r--libnautilus-extension/nautilus-menu.c2
-rw-r--r--libnautilus-extension/nautilus-property-page-provider.c2
-rw-r--r--libnautilus-extension/nautilus-property-page.c2
-rw-r--r--libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c2
-rw-r--r--libnautilus-private/nautilus-entry.c4
-rw-r--r--libnautilus-private/nautilus-file.c4
-rw-r--r--libnautilus-private/nautilus-icon-canvas-item.c10
-rw-r--r--libnautilus-private/nautilus-sidebar-provider.c2
-rw-r--r--libnautilus-private/nautilus-sidebar.c2
-rw-r--r--libnautilus-private/nautilus-view.c2
-rw-r--r--libnautilus-private/nautilus-window-info.c2
-rw-r--r--src/file-manager/fm-ditem-page.c4
-rw-r--r--src/file-manager/fm-list-model.c8
-rw-r--r--src/file-manager/fm-tree-model.c4
-rw-r--r--src/nautilus-navigation-action.c2
24 files changed, 78 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index f5257514b..4aa2212ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+2007-01-18 Christian Persch <chpe@svn.gnome.org>
+
+ * cut-n-paste-code/libegg/eggtreemultidnd.c:
+ (egg_tree_multi_drag_source_get_type):
+ * libnautilus-extension/nautilus-column-provider.c:
+ (nautilus_column_provider_get_type):
+ * libnautilus-extension/nautilus-column.c:
+ (nautilus_column_get_type):
+ * libnautilus-extension/nautilus-file-info.c:
+ (nautilus_file_info_get_type):
+ * libnautilus-extension/nautilus-info-provider.c:
+ (nautilus_info_provider_get_type):
+ * libnautilus-extension/nautilus-location-widget-provider.c:
+ (nautilus_location_widget_provider_get_type):
+ * libnautilus-extension/nautilus-menu-item.c:
+ (nautilus_menu_item_get_type):
+ * libnautilus-extension/nautilus-menu-provider.c:
+ (nautilus_menu_provider_get_type):
+ * libnautilus-extension/nautilus-menu.c: (nautilus_menu_get_type):
+ * libnautilus-extension/nautilus-property-page-provider.c:
+ (nautilus_property_page_provider_get_type):
+ * libnautilus-extension/nautilus-property-page.c:
+ (nautilus_property_page_get_type):
+ * libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c:
+ (nautilus_cell_renderer_pixbuf_emblem_get_type):
+ * libnautilus-private/nautilus-entry.c: (nautilus_entry_get_type):
+ * libnautilus-private/nautilus-file.c: (nautilus_file_get_type):
+ * libnautilus-private/nautilus-icon-canvas-item.c:
+ (nautilus_icon_canvas_item_accessible_get_type),
+ (nautilus_icon_canvas_item_get_type):
+ * libnautilus-private/nautilus-sidebar-provider.c:
+ (nautilus_sidebar_provider_get_type):
+ * libnautilus-private/nautilus-sidebar.c:
+ (nautilus_sidebar_get_type):
+ * libnautilus-private/nautilus-view.c: (nautilus_view_get_type):
+ * libnautilus-private/nautilus-window-info.c:
+ (nautilus_window_info_get_type):
+ * src/file-manager/fm-ditem-page.c: (fm_ditem_page_get_type):
+ * src/file-manager/fm-list-model.c: (fm_list_model_get_type):
+ * src/file-manager/fm-tree-model.c: (fm_tree_model_get_type):
+ * src/nautilus-navigation-action.c:
+ (nautilus_navigation_action_get_type): No need to make GTypeInfo and
+ GInterfaceInfo static. Bug #362034.
+
2007-01-18 Luca Ferretti <elle.uca@libero.it>
* src/nautilus-window-menus.c:
diff --git a/cut-n-paste-code/libegg/eggtreemultidnd.c b/cut-n-paste-code/libegg/eggtreemultidnd.c
index 3a7da919c..4850c6860 100644
--- a/cut-n-paste-code/libegg/eggtreemultidnd.c
+++ b/cut-n-paste-code/libegg/eggtreemultidnd.c
@@ -59,7 +59,7 @@ egg_tree_multi_drag_source_get_type (void)
if (!our_type)
{
- static const GTypeInfo our_info =
+ const GTypeInfo our_info =
{
sizeof (EggTreeMultiDragSourceIface), /* class_size */
NULL, /* base_init */
diff --git a/libnautilus-extension/nautilus-column-provider.c b/libnautilus-extension/nautilus-column-provider.c
index eff660ad0..67017d686 100644
--- a/libnautilus-extension/nautilus-column-provider.c
+++ b/libnautilus-extension/nautilus-column-provider.c
@@ -38,7 +38,7 @@ nautilus_column_provider_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusColumnProviderIface),
nautilus_column_provider_base_init,
NULL,
diff --git a/libnautilus-extension/nautilus-column.c b/libnautilus-extension/nautilus-column.c
index b0525e394..9532c2ebe 100644
--- a/libnautilus-extension/nautilus-column.c
+++ b/libnautilus-extension/nautilus-column.c
@@ -221,7 +221,7 @@ nautilus_column_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusColumnClass),
NULL,
NULL,
diff --git a/libnautilus-extension/nautilus-file-info.c b/libnautilus-extension/nautilus-file-info.c
index 7157048a5..08cae486b 100644
--- a/libnautilus-extension/nautilus-file-info.c
+++ b/libnautilus-extension/nautilus-file-info.c
@@ -60,7 +60,7 @@ nautilus_file_info_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusFileInfoIface),
nautilus_file_info_base_init,
NULL,
diff --git a/libnautilus-extension/nautilus-info-provider.c b/libnautilus-extension/nautilus-info-provider.c
index 942245190..e916e9d71 100644
--- a/libnautilus-extension/nautilus-info-provider.c
+++ b/libnautilus-extension/nautilus-info-provider.c
@@ -38,7 +38,7 @@ nautilus_info_provider_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusInfoProviderIface),
nautilus_info_provider_base_init,
NULL,
diff --git a/libnautilus-extension/nautilus-location-widget-provider.c b/libnautilus-extension/nautilus-location-widget-provider.c
index 50b93be77..7e09d57c2 100644
--- a/libnautilus-extension/nautilus-location-widget-provider.c
+++ b/libnautilus-extension/nautilus-location-widget-provider.c
@@ -38,7 +38,7 @@ nautilus_location_widget_provider_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusLocationWidgetProviderIface),
nautilus_location_widget_provider_base_init,
NULL,
diff --git a/libnautilus-extension/nautilus-menu-item.c b/libnautilus-extension/nautilus-menu-item.c
index 7012301d4..c3d2dff7d 100644
--- a/libnautilus-extension/nautilus-menu-item.c
+++ b/libnautilus-extension/nautilus-menu-item.c
@@ -286,7 +286,7 @@ nautilus_menu_item_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusMenuItemClass),
NULL,
NULL,
diff --git a/libnautilus-extension/nautilus-menu-provider.c b/libnautilus-extension/nautilus-menu-provider.c
index b3929f04e..09e14d7b4 100644
--- a/libnautilus-extension/nautilus-menu-provider.c
+++ b/libnautilus-extension/nautilus-menu-provider.c
@@ -53,7 +53,7 @@ nautilus_menu_provider_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusMenuProviderIface),
nautilus_menu_provider_base_init,
NULL,
diff --git a/libnautilus-extension/nautilus-menu.c b/libnautilus-extension/nautilus-menu.c
index 054baa322..8912ab8d2 100644
--- a/libnautilus-extension/nautilus-menu.c
+++ b/libnautilus-extension/nautilus-menu.c
@@ -103,7 +103,7 @@ nautilus_menu_get_type (void)
static GType type = 0;
if(type == 0) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusMenuClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
diff --git a/libnautilus-extension/nautilus-property-page-provider.c b/libnautilus-extension/nautilus-property-page-provider.c
index 90e6b5594..8c08cc25b 100644
--- a/libnautilus-extension/nautilus-property-page-provider.c
+++ b/libnautilus-extension/nautilus-property-page-provider.c
@@ -39,7 +39,7 @@ nautilus_property_page_provider_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusPropertyPageProviderIface),
nautilus_property_page_provider_base_init,
NULL,
diff --git a/libnautilus-extension/nautilus-property-page.c b/libnautilus-extension/nautilus-property-page.c
index d567322a4..a774915ac 100644
--- a/libnautilus-extension/nautilus-property-page.c
+++ b/libnautilus-extension/nautilus-property-page.c
@@ -204,7 +204,7 @@ nautilus_property_page_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusPropertyPageClass),
NULL,
NULL,
diff --git a/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c b/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c
index 37026e3a1..aa9b0a1e2 100644
--- a/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c
+++ b/libnautilus-private/nautilus-cell-renderer-pixbuf-emblem.c
@@ -85,7 +85,7 @@ nautilus_cell_renderer_pixbuf_emblem_get_type (void)
static GType cell_pixbuf_type = 0;
if (!cell_pixbuf_type) {
- static const GTypeInfo cell_pixbuf_info =
+ const GTypeInfo cell_pixbuf_info =
{
sizeof (NautilusCellRendererPixbufEmblemClass),
NULL, /* base_init */
diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c
index a665f4547..6c90a08f2 100644
--- a/libnautilus-private/nautilus-entry.c
+++ b/libnautilus-private/nautilus-entry.c
@@ -436,14 +436,14 @@ nautilus_entry_get_type (void)
static GType entry_type = 0;
if (entry_type == 0) {
- static const GInterfaceInfo editable_info =
+ const GInterfaceInfo editable_info =
{
(GInterfaceInitFunc) nautilus_entry_editable_init,
NULL,
NULL
};
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (NautilusEntryClass),
NULL, /* base_init */
NULL, /* base_finalize */
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index 9c984db07..0f959b20a 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -149,7 +149,7 @@ nautilus_file_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusFileClass),
NULL,
NULL,
@@ -161,7 +161,7 @@ nautilus_file_get_type (void)
(GInstanceInitFunc) nautilus_file_instance_init,
};
- static const GInterfaceInfo file_info_iface_info = {
+ const GInterfaceInfo file_info_iface_info = {
(GInterfaceInitFunc) nautilus_file_info_iface_init,
NULL,
NULL
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index bcc659d5d..62dc15dad 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -3078,21 +3078,21 @@ nautilus_icon_canvas_item_accessible_get_type (void)
static GType type = 0;
if (!type) {
- static const GInterfaceInfo atk_image_info = {
+ const GInterfaceInfo atk_image_info = {
(GInterfaceInitFunc)
nautilus_icon_canvas_item_accessible_image_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_text_info = {
+ const GInterfaceInfo atk_text_info = {
(GInterfaceInitFunc)
nautilus_icon_canvas_item_accessible_text_interface_init,
(GInterfaceFinalizeFunc) NULL,
NULL
};
- static const GInterfaceInfo atk_action_info = {
+ const GInterfaceInfo atk_action_info = {
(GInterfaceInitFunc)
nautilus_icon_canvas_item_accessible_action_interface_init,
(GInterfaceFinalizeFunc) NULL,
@@ -3250,7 +3250,7 @@ nautilus_icon_canvas_item_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusIconCanvasItemClass),
NULL, /* base_init */
NULL, /* base_finalize */
@@ -3261,7 +3261,7 @@ nautilus_icon_canvas_item_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) nautilus_icon_canvas_item_init,
};
- static const GInterfaceInfo eel_text_info = {
+ const GInterfaceInfo eel_text_info = {
(GInterfaceInitFunc)
nautilus_icon_canvas_item_text_interface_init,
(GInterfaceFinalizeFunc) NULL,
diff --git a/libnautilus-private/nautilus-sidebar-provider.c b/libnautilus-private/nautilus-sidebar-provider.c
index f6442b04d..908e634f6 100644
--- a/libnautilus-private/nautilus-sidebar-provider.c
+++ b/libnautilus-private/nautilus-sidebar-provider.c
@@ -36,7 +36,7 @@ nautilus_sidebar_provider_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusSidebarProviderIface),
nautilus_sidebar_provider_base_init,
NULL,
diff --git a/libnautilus-private/nautilus-sidebar.c b/libnautilus-private/nautilus-sidebar.c
index 4d9cf87eb..a1ef42b06 100644
--- a/libnautilus-private/nautilus-sidebar.c
+++ b/libnautilus-private/nautilus-sidebar.c
@@ -59,7 +59,7 @@ nautilus_sidebar_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusSidebarIface),
nautilus_sidebar_base_init,
NULL,
diff --git a/libnautilus-private/nautilus-view.c b/libnautilus-private/nautilus-view.c
index 8b42070df..47058f3ac 100644
--- a/libnautilus-private/nautilus-view.c
+++ b/libnautilus-private/nautilus-view.c
@@ -77,7 +77,7 @@ nautilus_view_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusViewIface),
nautilus_view_base_init,
NULL,
diff --git a/libnautilus-private/nautilus-window-info.c b/libnautilus-private/nautilus-window-info.c
index 436f6c56a..56649865b 100644
--- a/libnautilus-private/nautilus-window-info.c
+++ b/libnautilus-private/nautilus-window-info.c
@@ -89,7 +89,7 @@ nautilus_window_info_get_type (void)
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ const GTypeInfo info = {
sizeof (NautilusWindowInfoIface),
nautilus_window_info_base_init,
NULL,
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index e845d1645..23a615e25 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -470,7 +470,7 @@ fm_ditem_page_get_type (void)
static GType provider_type = 0;
if (!provider_type) {
- static const GTypeInfo type_info = {
+ const GTypeInfo type_info = {
sizeof (FMDitemPageClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
@@ -482,7 +482,7 @@ fm_ditem_page_get_type (void)
(GInstanceInitFunc) fm_ditem_page_instance_init,
};
- static const GInterfaceInfo property_page_provider_iface_info = {
+ const GInterfaceInfo property_page_provider_iface_info = {
(GInterfaceInitFunc) fm_ditem_page_property_page_provider_iface_init,
NULL,
NULL
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index 8e9822f56..298d642fe 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -1619,7 +1619,7 @@ fm_list_model_get_type (void)
static GType object_type = 0;
if (object_type == 0) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (FMListModelClass),
NULL, /* base_init */
NULL, /* base_finalize */
@@ -1631,19 +1631,19 @@ fm_list_model_get_type (void)
(GInstanceInitFunc) fm_list_model_init,
};
- static const GInterfaceInfo tree_model_info = {
+ const GInterfaceInfo tree_model_info = {
(GInterfaceInitFunc) fm_list_model_tree_model_init,
NULL,
NULL
};
- static const GInterfaceInfo sortable_info = {
+ const GInterfaceInfo sortable_info = {
(GInterfaceInitFunc) fm_list_model_sortable_init,
NULL,
NULL
};
- static const GInterfaceInfo multi_drag_source_info = {
+ const GInterfaceInfo multi_drag_source_info = {
(GInterfaceInitFunc) fm_list_model_multi_drag_source_init,
NULL,
NULL
diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c
index 6a90c9711..f82b63fe8 100644
--- a/src/file-manager/fm-tree-model.c
+++ b/src/file-manager/fm-tree-model.c
@@ -1878,7 +1878,7 @@ fm_tree_model_get_type (void)
static GType object_type = 0;
if (object_type == 0) {
- static const GTypeInfo object_info = {
+ const GTypeInfo object_info = {
sizeof (FMTreeModelClass),
NULL,
NULL,
@@ -1890,7 +1890,7 @@ fm_tree_model_get_type (void)
(GInstanceInitFunc) fm_tree_model_init,
};
- static const GInterfaceInfo tree_model_info = {
+ const GInterfaceInfo tree_model_info = {
(GInterfaceInitFunc) fm_tree_model_tree_model_init,
NULL,
NULL
diff --git a/src/nautilus-navigation-action.c b/src/nautilus-navigation-action.c
index 71c985a43..9b7e2b268 100644
--- a/src/nautilus-navigation-action.c
+++ b/src/nautilus-navigation-action.c
@@ -65,7 +65,7 @@ nautilus_navigation_action_get_type (void)
static GType type = 0;
if (type == 0) {
- static const GTypeInfo type_info = {
+ const GTypeInfo type_info = {
sizeof (NautilusNavigationActionClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,