summaryrefslogtreecommitdiff
path: root/libnautilus
diff options
context:
space:
mode:
Diffstat (limited to 'libnautilus')
-rw-r--r--libnautilus/gnome-icon-container.c7
-rw-r--r--libnautilus/gtkscrollframe.c2
-rw-r--r--libnautilus/nautilus-content-view-frame.c2
-rw-r--r--libnautilus/nautilus-meta-view-frame.c9
-rw-r--r--libnautilus/nautilus-view-frame.c2
-rw-r--r--libnautilus/nautilus-view.c2
-rw-r--r--libnautilus/ntl-content-view-client.c2
-rw-r--r--libnautilus/ntl-content-view-frame.c2
-rw-r--r--libnautilus/ntl-meta-view-client.c9
-rw-r--r--libnautilus/ntl-meta-view-frame.c9
-rw-r--r--libnautilus/ntl-view-client.c2
-rw-r--r--libnautilus/ntl-view-frame.c2
12 files changed, 24 insertions, 26 deletions
diff --git a/libnautilus/gnome-icon-container.c b/libnautilus/gnome-icon-container.c
index 421c36858..876b74e2e 100644
--- a/libnautilus/gnome-icon-container.c
+++ b/libnautilus/gnome-icon-container.c
@@ -2388,8 +2388,9 @@ gnome_icon_container_get_type (void)
sizeof (GnomeIconContainerClass),
(GtkClassInitFunc) class_init,
(GtkObjectInitFunc) init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ NULL,
+ NULL,
+ NULL
};
type = gtk_type_unique (gnome_canvas_get_type (), &type_info);
@@ -2426,7 +2427,7 @@ gnome_icon_container_set_icon_mode (GnomeIconContainer *container,
{
g_return_if_fail (container != NULL);
- if (mode < 0 || mode >= NUM_ICON_MODES) {
+ if (mode >= NUM_ICON_MODES) {
g_warning ("Unknown icon mode %d", mode);
return;
}
diff --git a/libnautilus/gtkscrollframe.c b/libnautilus/gtkscrollframe.c
index a0c6de3f2..c7ef7d329 100644
--- a/libnautilus/gtkscrollframe.c
+++ b/libnautilus/gtkscrollframe.c
@@ -1137,7 +1137,7 @@ gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type)
g_return_if_fail (sf != NULL);
g_return_if_fail (GTK_IS_SCROLL_FRAME (sf));
- g_return_if_fail (shadow_type >= GTK_SHADOW_NONE && shadow_type <= GTK_SHADOW_ETCHED_OUT);
+ g_return_if_fail (shadow_type <= GTK_SHADOW_ETCHED_OUT);
priv = sf->priv;
diff --git a/libnautilus/nautilus-content-view-frame.c b/libnautilus/nautilus-content-view-frame.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus/nautilus-content-view-frame.c
+++ b/libnautilus/nautilus-content-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
NULL /* _private */
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
{
diff --git a/libnautilus/nautilus-meta-view-frame.c b/libnautilus/nautilus-meta-view-frame.c
index 585106504..27eaf3a19 100644
--- a/libnautilus/nautilus-meta-view-frame.c
+++ b/libnautilus/nautilus-meta-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
NULL /* _private */
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
{
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
- /* set description */
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
- gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
- GNOME_PROPERTY_READ_ONLY);
+ gnome_property_bag_add(bag, "label", "string",
+ g_strdup(label), g_strdup(label),
+ _("Label"), GNOME_PROPERTY_READ_ONLY);
}
-
diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/nautilus-view-frame.c
+++ b/libnautilus/nautilus-view-frame.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_notify_selection_change
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
{
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_notify_selection_change
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
{
diff --git a/libnautilus/ntl-content-view-client.c b/libnautilus/ntl-content-view-client.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus/ntl-content-view-client.c
+++ b/libnautilus/ntl-content-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
NULL /* _private */
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
{
diff --git a/libnautilus/ntl-content-view-frame.c b/libnautilus/ntl-content-view-frame.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus/ntl-content-view-frame.c
+++ b/libnautilus/ntl-content-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
NULL /* _private */
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
{
diff --git a/libnautilus/ntl-meta-view-client.c b/libnautilus/ntl-meta-view-client.c
index 585106504..27eaf3a19 100644
--- a/libnautilus/ntl-meta-view-client.c
+++ b/libnautilus/ntl-meta-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
NULL /* _private */
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
{
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
- /* set description */
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
- gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
- GNOME_PROPERTY_READ_ONLY);
+ gnome_property_bag_add(bag, "label", "string",
+ g_strdup(label), g_strdup(label),
+ _("Label"), GNOME_PROPERTY_READ_ONLY);
}
-
diff --git a/libnautilus/ntl-meta-view-frame.c b/libnautilus/ntl-meta-view-frame.c
index 585106504..27eaf3a19 100644
--- a/libnautilus/ntl-meta-view-frame.c
+++ b/libnautilus/ntl-meta-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
NULL /* _private */
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
{
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
- /* set description */
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
- gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
- GNOME_PROPERTY_READ_ONLY);
+ gnome_property_bag_add(bag, "label", "string",
+ g_strdup(label), g_strdup(label),
+ _("Label"), GNOME_PROPERTY_READ_ONLY);
}
-
diff --git a/libnautilus/ntl-view-client.c b/libnautilus/ntl-view-client.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/ntl-view-client.c
+++ b/libnautilus/ntl-view-client.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_notify_selection_change
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
{
diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/ntl-view-frame.c
+++ b/libnautilus/ntl-view-frame.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_notify_selection_change
};
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
{
View Lorry Controller Status