Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/cut-n-paste/recent-files/egg-recent-item.c
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@src.gnome.org>2005-04-07 22:28:30 (GMT)
committer Nickolay V. Shmyrev <nshmyrev@src.gnome.org>2005-04-07 22:28:30 (GMT)
commitbb24964d2d9593e35ff5693129d8cb0a688be47b (patch)
tree772c9fb272eaea57566c358d0b096a367db5a195 /cut-n-paste/recent-files/egg-recent-item.c
parentc3e1500a4815225f08e1b20dd066559e8c92c280 (diff)
Update egg-recent from libegg. This should fix long delay on startup
* cut-n-paste/recent-files/egg-recent-item.c: (egg_recent_item_set_uri), (make_valid_utf8), (egg_recent_item_set_mime_type), (egg_recent_item_get_mime_type): * cut-n-paste/recent-files/egg-recent-item.h: Update egg-recent from libegg. This should fix long delay on startup problem. For details see http://bugzilla.gnome.org/show_bug.cgi?id=160531
Diffstat (limited to 'cut-n-paste/recent-files/egg-recent-item.c')
-rw-r--r--cut-n-paste/recent-files/egg-recent-item.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cut-n-paste/recent-files/egg-recent-item.c b/cut-n-paste/recent-files/egg-recent-item.c
index c533205..535e222 100644
--- a/cut-n-paste/recent-files/egg-recent-item.c
+++ b/cut-n-paste/recent-files/egg-recent-item.c
@@ -128,6 +128,7 @@ egg_recent_item_copy (const EggRecentItem *item)
newitem->uri = g_strdup (item->uri);
if (item->mime_type)
newitem->mime_type = g_strdup (item->mime_type);
+ newitem->mime_type_is_explicit = item->mime_type_is_explicit
newitem->timestamp = item->timestamp;
newitem->private_data = item->private_data;
newitem->groups = egg_recent_item_copy_groups (item->groups);
@@ -219,8 +220,6 @@ egg_recent_item_set_uri (EggRecentItem *item, const gchar *uri)
g_free (utf8_uri);
}
- egg_recent_item_update_mime_type (item);
-
return TRUE;
}
@@ -261,7 +260,7 @@ make_valid_utf8 (const char *name)
string = NULL;
remainder = name;
- remaining_bytes = strlen (name);
+ remaining_bytes = name ? strlen (name) : 0;
while (remaining_bytes != 0) {
if (g_utf8_validate (remainder, remaining_bytes, &invalid))
@@ -355,13 +354,14 @@ egg_recent_item_set_mime_type (EggRecentItem *item, const gchar *mime)
item->mime_type = g_strdup (mime);
} else {
item->mime_type_is_explicit = FALSE;
- egg_recent_item_update_mime_type (item);
}
}
gchar *
-egg_recent_item_get_mime_type (const EggRecentItem *item)
+egg_recent_item_get_mime_type (EggRecentItem *item)
{
+ egg_recent_item_update_mime_type (item);
+
return g_strdup (item->mime_type);
}