diff options
| author | Mathieu Lacage <mathieu@eazel.com> | 2000-07-30 20:41:13 +0000 |
|---|---|---|
| committer | Mathieu Lacage <mathieu@src.gnome.org> | 2000-07-30 20:41:13 +0000 |
| commit | 46d9cf6a56feafe1015b1be0ec120827abe60ff2 (patch) | |
| tree | 533610ad2d77e134fa5a662c4413504ee572fbb1 | |
| parent | f2e583b61e81179fe83549e7daba7f01b8e6efd8 (diff) | |
| download | nautilus-46d9cf6a56feafe1015b1be0ec120827abe60ff2.tar.gz | |
Make nautilus build with the latest oaf changes. _I_ did not broke the
2000-07-30 Mathieu Lacage <mathieu@eazel.com>
Make nautilus build with the latest oaf changes.
_I_ did not broke the build for once :)
* libnautilus-extensions/nautilus-mime-actions.c:
(server_matches_content_requirements):
* libnautilus-extensions/nautilus-view-identifier.c:
(nautilus_view_identifier_new_from_oaf_server_info):
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-mime-actions.c | 8 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-view-identifier.c | 4 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-mime-actions.c | 8 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-view-identifier.c | 4 |
5 files changed, 22 insertions, 12 deletions
@@ -1,3 +1,13 @@ +2000-07-30 Mathieu Lacage <mathieu@eazel.com> + + Make nautilus build with the latest oaf changes. + _I_ did not broke the build for once :) + + * libnautilus-extensions/nautilus-mime-actions.c: + (server_matches_content_requirements): + * libnautilus-extensions/nautilus-view-identifier.c: + (nautilus_view_identifier_new_from_oaf_server_info): + 2000-07-30 Fatih Demir <kabalak@gmx.net> * configure.in: Added zh_TW.Big5 to ALL_LINGUAS. diff --git a/libnautilus-extensions/nautilus-mime-actions.c b/libnautilus-extensions/nautilus-mime-actions.c index 97f539fe6..0c8459eca 100644 --- a/libnautilus-extensions/nautilus-mime-actions.c +++ b/libnautilus-extensions/nautilus-mime-actions.c @@ -1312,7 +1312,7 @@ mime_type_hash_table_destroy (GHashTable *table) static gboolean server_matches_content_requirements (OAF_ServerInfo *server, GHashTable *type_table, GList *explicit_iids) { - OAF_Attribute *attr; + OAF_Property *prop; GNOME_stringlist types; int i; @@ -1321,12 +1321,12 @@ server_matches_content_requirements (OAF_ServerInfo *server, GHashTable *type_ta return TRUE; } - attr = oaf_server_info_attr_find (server, "nautilus:required_directory_content_mime_types"); + prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); - if (attr == NULL || attr->v._d != OAF_A_STRINGV) { + if (prop == NULL || prop->v._d != OAF_P_STRINGV) { return TRUE; } else { - types = attr->v._u.value_stringv; + types = prop->v._u.value_stringv; for (i = 0; i < types._length; i++) { if (g_hash_table_lookup (type_table, types._buffer[i]) != NULL) { diff --git a/libnautilus-extensions/nautilus-view-identifier.c b/libnautilus-extensions/nautilus-view-identifier.c index 940252d75..37d71f0a2 100644 --- a/libnautilus-extensions/nautilus-view-identifier.c +++ b/libnautilus-extensions/nautilus-view-identifier.c @@ -91,10 +91,10 @@ nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char GSList *langs; langs = get_lang_list (); - view_as_name = oaf_server_info_attr_lookup (server, name_attribute, langs); + view_as_name = oaf_server_info_prop_lookup (server, name_attribute, langs); if (view_as_name == NULL) { - view_as_name = oaf_server_info_attr_lookup (server, "name", langs); + view_as_name = oaf_server_info_prop_lookup (server, "name", langs); } if (view_as_name == NULL) { diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index 97f539fe6..0c8459eca 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -1312,7 +1312,7 @@ mime_type_hash_table_destroy (GHashTable *table) static gboolean server_matches_content_requirements (OAF_ServerInfo *server, GHashTable *type_table, GList *explicit_iids) { - OAF_Attribute *attr; + OAF_Property *prop; GNOME_stringlist types; int i; @@ -1321,12 +1321,12 @@ server_matches_content_requirements (OAF_ServerInfo *server, GHashTable *type_ta return TRUE; } - attr = oaf_server_info_attr_find (server, "nautilus:required_directory_content_mime_types"); + prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types"); - if (attr == NULL || attr->v._d != OAF_A_STRINGV) { + if (prop == NULL || prop->v._d != OAF_P_STRINGV) { return TRUE; } else { - types = attr->v._u.value_stringv; + types = prop->v._u.value_stringv; for (i = 0; i < types._length; i++) { if (g_hash_table_lookup (type_table, types._buffer[i]) != NULL) { diff --git a/libnautilus-private/nautilus-view-identifier.c b/libnautilus-private/nautilus-view-identifier.c index 940252d75..37d71f0a2 100644 --- a/libnautilus-private/nautilus-view-identifier.c +++ b/libnautilus-private/nautilus-view-identifier.c @@ -91,10 +91,10 @@ nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char GSList *langs; langs = get_lang_list (); - view_as_name = oaf_server_info_attr_lookup (server, name_attribute, langs); + view_as_name = oaf_server_info_prop_lookup (server, name_attribute, langs); if (view_as_name == NULL) { - view_as_name = oaf_server_info_attr_lookup (server, "name", langs); + view_as_name = oaf_server_info_prop_lookup (server, "name", langs); } if (view_as_name == NULL) { |