Commit 9d0e1163 authored by A. Walton's avatar A. Walton Committed by Andrew Walton

Remove deprecated GLib symbols and build with -DG_DISABLE_DEPRECATED.

2008-02-07  A. Walton <awalton@svn.gnome.org>
* configure.in:
* libnautilus-private/nautilus-emblem-utils.c:
(is_reserved_keyword):
* libnautilus-private/nautilus-file.c:
(nautilus_file_fit_date_as_string):
* src/file-manager/fm-list-model.c: (fm_list_model_get_value):
Remove deprecated GLib symbols and build with -DG_DISABLE_DEPRECATED.

svn path=/trunk/; revision=13704
parent bee5ecc3
2008-02-07 A. Walton <awalton@svn.gnome.org>
* configure.in:
* libnautilus-private/nautilus-emblem-utils.c:
(is_reserved_keyword):
* libnautilus-private/nautilus-file.c:
(nautilus_file_fit_date_as_string):
* src/file-manager/fm-list-model.c: (fm_list_model_get_value):
Remove deprecated GLib symbols and build with -DG_DISABLE_DEPRECATED.
2008-02-07 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-icon-dnd.c:
......
......@@ -408,7 +408,7 @@ AC_SUBST(CORE_LIBS)
CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
AC_SUBST(CORE_IDL_INCLUDES)
DISABLE_DEPRECATED_CFLAGS=""
DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED"
dnl Multimedia keys
AC_CHECK_HEADERS([X11/XF86keysym.h])
......
......@@ -83,22 +83,22 @@ is_reserved_keyword (const char *keyword)
g_assert (keyword != NULL);
/* check intrinsic emblems */
if (g_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_TRASH) == 0) {
if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_TRASH) == 0) {
return TRUE;
}
if (g_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_READ) == 0) {
if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_READ) == 0) {
return TRUE;
}
if (g_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_WRITE) == 0) {
if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_CANT_WRITE) == 0) {
return TRUE;
}
if (g_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_SYMBOLIC_LINK) == 0) {
if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_SYMBOLIC_LINK) == 0) {
return TRUE;
}
if (g_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_NOTE) == 0) {
if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_NOTE) == 0) {
return TRUE;
}
if (g_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_DESKTOP) == 0) {
if (g_ascii_strcasecmp (keyword, NAUTILUS_FILE_EMBLEM_NAME_DESKTOP) == 0) {
return TRUE;
}
......@@ -107,7 +107,7 @@ is_reserved_keyword (const char *keyword)
/* see if the keyword already exists */
result = g_list_find_custom (available,
(char *) icon_name,
(GCompareFunc) g_strcasecmp) != NULL;
(GCompareFunc) g_ascii_strcasecmp) != NULL;
eel_g_list_free_deep (available);
g_free (icon_name);
return result;
......
......@@ -3576,7 +3576,7 @@ nautilus_file_fit_date_as_string (NautilusFile *file,
file_date = eel_g_date_new_tm (file_time);
today = g_date_new ();
g_date_set_time (today, time (NULL));
g_date_set_time_t (today, time (NULL));
/* Overflow results in a large number; fine for our purposes. */
file_date_age = (g_date_get_julian (today) -
......
......@@ -377,7 +377,7 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column
if (file != NULL) {
str = nautilus_file_get_string_attribute_with_default_q (file,
attribute);
g_value_set_string_take_ownership (value, str);
g_value_take_string (value, str);
} else if (attribute == attribute_name_q) {
if (file_entry->parent->loaded) {
g_value_set_string (value, _("(Empty)"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment