diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-07-11 20:32:19 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-07-11 20:32:19 +0000 |
| commit | 49b92440deaabb43114479e5b0e6af2c481ca8ac (patch) | |
| tree | 011c39768a3be7d7d1f63d9d48d1b6e96383fdf0 /epan/filesystem.c | |
| parent | 1f923105f8a5c2c7bf82f1187984600ba14ef993 (diff) | |
More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.
svn path=/trunk/; revision=37978
Diffstat (limited to 'epan/filesystem.c')
| -rw-r--r-- | epan/filesystem.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/epan/filesystem.c b/epan/filesystem.c index 1072d91d59..7ce3786eaf 100644 --- a/epan/filesystem.c +++ b/epan/filesystem.c @@ -1270,15 +1270,6 @@ create_persconffile_dir(char **pf_dir_path_return) return create_persconffile_profile(persconfprofile, pf_dir_path_return); } -#if ! GLIB_CHECK_VERSION(2,14,0) -static void -hash_table_get_keys(gpointer key, gpointer value _U_, gpointer user_data) -{ - GList **files = ((GList **)user_data); - *files = g_list_append (*files, key); -} -#endif - int copy_persconffile_profile(const char *toname, const char *fromname, gboolean from_global, char **pf_filename_return, char **pf_to_dir_path_return, char **pf_from_dir_path_return) @@ -1298,13 +1289,7 @@ copy_persconffile_profile(const char *toname, const char *fromname, gboolean fro from_dir = g_strdup (get_persconffile_dir(fromname)); } -#if GLIB_CHECK_VERSION(2,14,0) files = g_hash_table_get_keys(profile_files); -#else - files = NULL; - g_hash_table_foreach(profile_files, hash_table_get_keys, &files); -#endif - file = g_list_first(files); while (file) { filename = (gchar *)file->data; |