aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-03-04 19:42:28 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-03-04 19:42:28 +0800
commit0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb (patch)
tree29233fdea4c356af916664bf0b779907e20bf9fc /lib
parentc615a211b12f14649045651af653d251dd46a29b (diff)
downloadgsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.gz
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.bz2
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.lz
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.xz
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.tar.zst
gsoc2013-epiphany-0edd1d380be6ee3a7dbcf5b93fe757ed5bbc1ebb.zip
about:options and about:epiphany
2003-03-04 Marco Pesenti Gritti <marco@it.gnome.org> * data/Makefile.am: * embed/mozilla/Makefile.am: * embed/mozilla/MozRegisterComponents.cpp: * src/Makefile.am: about:options and about:epiphany * src/ephy-shell.c: (ephy_init_services): monitor proxy changes * src/prefs-dialog.c: (create_page), (prefs_dialog_get_page): * src/ui-prefs.c: * src/ui-prefs.h: * lib/widgets/ephy-spinner.c: (ephy_spinner_get_theme_info), (ephy_spinner_init_directory_list), (ephy_spinner_info_free), (ephy_spinner_get_theme_path): * lib/widgets/ephy-spinner.h: Remove spinner configuration, this should be part of the icon theme at some point.
Diffstat (limited to 'lib')
-rw-r--r--lib/widgets/ephy-spinner.c86
-rw-r--r--lib/widgets/ephy-spinner.h9
2 files changed, 13 insertions, 82 deletions
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index f89bd6ef0..aaa43746a 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -71,13 +71,17 @@ static GList *spinner_directories = NULL;
static void
ephy_spinner_init_directory_list (void);
-static void
-ephy_spinner_search_directory (const gchar *base, GList **spinner_list);
static EphySpinnerInfo *
ephy_spinner_get_theme_info (const gchar *base, const gchar *theme_name);
static gchar *
ephy_spinner_get_theme_path (const gchar *theme_name);
+struct EphySpinnerInfo
+{
+ char *name;
+ char *filename;
+ char *directory;
+};
static GObjectClass *parent_class = NULL;
@@ -550,38 +554,6 @@ ephy_spinner_class_init (EphySpinnerClass *class)
widget_class->map = ephy_spinner_map;
}
-static void
-ephy_spinner_search_directory (const gchar *base, GList **spinner_list)
-{
- GnomeVFSResult rc;
- GList *list, *node;
-
- rc = gnome_vfs_directory_list_load
- (&list, base, (GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
- GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE |
- GNOME_VFS_FILE_INFO_FOLLOW_LINKS));
- if (rc != GNOME_VFS_OK) return;
-
- for (node = list; node != NULL; node = g_list_next (node))
- {
- GnomeVFSFileInfo *file_info = node->data;
- EphySpinnerInfo *info;
-
- if (file_info->name[0] == '.')
- continue;
- if (file_info->type != GNOME_VFS_FILE_TYPE_DIRECTORY)
- continue;
-
- info = ephy_spinner_get_theme_info (base, file_info->name);
- if (info != NULL)
- {
- *spinner_list = g_list_append (*spinner_list, info);
- }
- }
-
- gnome_vfs_file_info_list_free (list);
-}
-
static EphySpinnerInfo *
ephy_spinner_get_theme_info (const gchar *base, const gchar *theme_name)
{
@@ -589,7 +561,7 @@ ephy_spinner_get_theme_info (const gchar *base, const gchar *theme_name)
gchar *path;
gchar *icon;
- path = g_build_filename (base, theme_name, NULL);
+ path = g_build_filename (base, theme_name, "throbber", NULL);
icon = g_build_filename (path, "rest.png", NULL);
if (!g_file_test (icon, G_FILE_TEST_EXISTS))
@@ -597,17 +569,6 @@ ephy_spinner_get_theme_info (const gchar *base, const gchar *theme_name)
g_free (path);
g_free (icon);
- /* handle nautilus throbbers as well */
-
- path = g_build_filename (base, theme_name, "throbber", NULL);
- icon = g_build_filename (path, "rest.png", NULL);
- }
-
- if (!g_file_test (icon, G_FILE_TEST_EXISTS))
- {
- g_free (path);
- g_free (icon);
-
return NULL;
}
@@ -624,12 +585,6 @@ ephy_spinner_init_directory_list (void)
{
gchar *path;
- path = g_build_filename (g_get_home_dir (), ephy_dot_dir (), "spinners", NULL);
- spinner_directories = g_list_append (spinner_directories, path);
-
- path = g_build_filename (SHARE_DIR, "spinners", NULL);
- spinner_directories = g_list_append (spinner_directories, path);
-
path = g_build_filename (SHARE_DIR, "..", "pixmaps", "nautilus", NULL);
spinner_directories = g_list_append (spinner_directories, path);
@@ -639,19 +594,13 @@ ephy_spinner_init_directory_list (void)
#endif
}
-GList *
-ephy_spinner_list_spinners (void)
+static void
+ephy_spinner_info_free (EphySpinnerInfo *info)
{
- GList *spinner_list = NULL;
- GList *tmp;
-
- for (tmp = spinner_directories; tmp != NULL; tmp = g_list_next (tmp))
- {
- gchar *path = tmp->data;
- ephy_spinner_search_directory (path, &spinner_list);
- }
-
- return spinner_list;
+ g_free (info->name);
+ g_free (info->directory);
+ g_free (info->filename);
+ g_free (info);
}
static gchar *
@@ -675,12 +624,3 @@ ephy_spinner_get_theme_path (const gchar *theme_name)
return NULL;
}
-
-void
-ephy_spinner_info_free (EphySpinnerInfo *info)
-{
- g_free (info->name);
- g_free (info->directory);
- g_free (info->filename);
- g_free (info);
-}
diff --git a/lib/widgets/ephy-spinner.h b/lib/widgets/ephy-spinner.h
index 5ea60b074..5bdc1f279 100644
--- a/lib/widgets/ephy-spinner.h
+++ b/lib/widgets/ephy-spinner.h
@@ -41,13 +41,6 @@ G_BEGIN_DECLS
typedef struct EphySpinnerInfo EphySpinnerInfo;
-struct EphySpinnerInfo
-{
- gchar *name;
- gchar *filename;
- gchar *directory;
-};
-
typedef struct EphySpinner EphySpinner;
typedef struct EphySpinnerClass EphySpinnerClass;
typedef struct EphySpinnerDetails EphySpinnerDetails;
@@ -67,8 +60,6 @@ void ephy_spinner_start (EphySpinner *throbber);
void ephy_spinner_stop (EphySpinner *throbber);
void ephy_spinner_set_small_mode (EphySpinner *spinner,
gboolean new_mode);
-GList *ephy_spinner_list_spinners (void);
-void ephy_spinner_info_free (EphySpinnerInfo *info);
G_END_DECLS