[gthumb] Remove unused code
- From: Michael J. Chudobiak <mjc src gnome org>
- To: svn-commits-list gnome org
- Subject: [gthumb] Remove unused code
- Date: Sat, 30 May 2009 09:39:39 -0400 (EDT)
commit 2394c70fc6ed7fc42ce03c0d486fee0e57d53500
Author: Marc Pavot <marc pavot gmail com>
Date: Sat May 30 09:38:22 2009 -0400
Remove unused code
Detected with: cppcheck -a -q -s --unused-functions src libgthumb
There are false positives for methods used in macros,
(like *_get_type () or *_class_init () methods) but not that much.
---
libgthumb/async-pixbuf-ops.c | 202 -----------------------
libgthumb/async-pixbuf-ops.h | 4 -
libgthumb/bookmarks.c | 6 -
libgthumb/bookmarks.h | 2 -
libgthumb/catalog.c | 18 --
libgthumb/catalog.h | 2 -
libgthumb/file-data.c | 15 --
libgthumb/file-data.h | 1 -
libgthumb/glib-utils.c | 17 --
libgthumb/glib-utils.h | 1 -
libgthumb/gth-exif-utils.c | 19 ---
libgthumb/gth-exif-utils.h | 2 -
libgthumb/gth-file-list.c | 57 -------
libgthumb/gth-file-list.h | 8 -
libgthumb/gth-file-view-list.c | 307 ------------------------------------
libgthumb/gth-file-view-thumbs.c | 190 ----------------------
libgthumb/gth-file-view.c | 260 ------------------------------
libgthumb/gth-file-view.h | 71 ---------
libgthumb/gth-filter.c | 52 ------
libgthumb/gth-filter.h | 10 --
libgthumb/gth-image-list.c | 173 --------------------
libgthumb/gth-image-list.h | 27 ---
libgthumb/gthumb-histogram.c | 17 +--
libgthumb/gthumb-histogram.h | 4 -
libgthumb/gthumb-info-bar.c | 9 -
libgthumb/gthumb-info-bar.h | 4 -
libgthumb/image-loader.c | 127 ---------------
libgthumb/image-loader.h | 7 -
libgthumb/image-viewer-image.c | 38 -----
libgthumb/image-viewer-image.h | 1 -
libgthumb/image-viewer.c | 251 -----------------------------
libgthumb/image-viewer.h | 24 ---
libgthumb/pixbuf-utils.c | 13 --
libgthumb/pixbuf-utils.h | 3 -
libgthumb/print-callbacks.c | 3 -
libgthumb/progress-dialog.c | 8 -
libgthumb/progress-dialog.h | 3 -
src/albumtheme-private.c | 108 -------------
src/albumtheme-private.h | 14 --
src/bookmark-list.c | 40 -----
src/bookmark-list.h | 6 -
src/catalog-list.c | 16 --
src/catalog-list.h | 2 -
src/catalog-web-exporter.c | 14 --
src/catalog-web-exporter.h | 2 -
src/dlg-redeye-removal.c | 10 +-
src/dlg-reset-exif.c | 22 ---
src/dlg-reset-exif.h | 1 -
src/gth-batch-op.c | 8 -
src/gth-batch-op.h | 1 -
src/gth-dir-list.c | 28 ----
src/gth-dir-list.h | 2 -
src/gth-fullscreen.c | 2 -
src/gth-image-selector.c | 22 ---
src/gth-image-selector.h | 4 -
src/gth-window-actions-callbacks.c | 2 -
src/gth-window.c | 7 -
src/gth-window.h | 1 -
src/gthumb-preloader.c | 42 -----
src/gthumb-preloader.h | 4 -
60 files changed, 4 insertions(+), 2310 deletions(-)
diff --git a/libgthumb/async-pixbuf-ops.c b/libgthumb/async-pixbuf-ops.c
index 38f9d67..8d63f23 100644
--- a/libgthumb/async-pixbuf-ops.c
+++ b/libgthumb/async-pixbuf-ops.c
@@ -66,29 +66,6 @@ enum {
typedef void (*IterateFunc) (guchar *src, gpointer extra_data);
-static void
-_gdk_pixbuf_iterate (GdkPixbuf *src,
- gpointer extra_data,
- IterateFunc iterate_func)
-{
- guint h = gdk_pixbuf_get_height (src);
- guchar *pixels = gdk_pixbuf_get_pixels (src);
- int n_channels = gdk_pixbuf_get_n_channels (src);
- int rowstride = gdk_pixbuf_get_rowstride (src);
-
- while (h--) {
- guint w = gdk_pixbuf_get_width (src);
- guchar *p = pixels;
-
- while (w--) {
- (*iterate_func) (p, extra_data);
- p += n_channels;
- }
-
- pixels += rowstride;
- }
-}
-
/* -- desaturate -- */
@@ -1164,185 +1141,6 @@ _gdk_pixbuf_adjust_levels (GdkPixbuf *src,
}
-typedef struct {
- int alpha;
- guchar lut[256][3];
- guchar min[3];
- guchar max[3];
- gboolean has_alpha;
-} StretchContrastData;
-
-
-static void
-stretch__find_min_max (guchar *src,
- gpointer extra_data)
-{
- StretchContrastData *data = extra_data;
- int b;
-
- for (b = 0; b < data->alpha; b++)
- if (! data->has_alpha || src[data->alpha]) {
- if (src[b] < data->min[b])
- data->min[b] = src[b];
- if (src[b] > data->max[b])
- data->max[b] = src[b];
- }
-}
-
-
-static void
-stretch_contrast_init (GthPixbufOp *pixop)
-{
- StretchContrastData *data = pixop->data;
- int b;
-
- data->has_alpha = gdk_pixbuf_get_has_alpha (pixop->src);
- data->alpha = gdk_pixbuf_get_n_channels (pixop->src);
-
- data->min[0] = data->min[1] = data->min[2] = 255;
- data->max[0] = data->max[1] = data->max[2] = 0;
- _gdk_pixbuf_iterate (pixop->src, data, stretch__find_min_max);
-
- /* Calculate LUTs with stretched contrast */
- for (b = 0; b < data->alpha; b++) {
- int range = data->max[b] - data->min[b];
-
- if (range != 0) {
- int x;
- for (x = data->min[b]; x <= data->max[b]; x++)
- data->lut[x][b] = 255 * (x - data->min[b]) / range;
- } else
- data->lut[data->min[b]][b] = data->min[b];
- }
-}
-
-
-static void
-stretch_contrast_step (GthPixbufOp *pixop)
-{
- StretchContrastData *data = pixop->data;
- int b;
-
- for (b = 0; b < data->alpha; b++)
- pixop->dest_pixel[b] = data->lut[pixop->src_pixel[b]][b];
-
- if (data->has_alpha)
- pixop->dest_pixel[data->alpha] = pixop->src_pixel[data->alpha];
-}
-
-
-static void
-stretch_contrast_release (GthPixbufOp *pixop)
-{
- g_free (pixop->data);
-}
-
-
-GthPixbufOp*
-_gdk_pixbuf_stretch_contrast (GdkPixbuf *src,
- GdkPixbuf *dest)
-{
- StretchContrastData *data;
-
- data = g_new (StretchContrastData, 1);
-
- return gth_pixbuf_op_new (src, dest,
- stretch_contrast_init,
- stretch_contrast_step,
- stretch_contrast_release,
- data);
-}
-
-
-typedef struct {
- int alpha;
- guchar lut[256];
- guchar min;
- guchar max;
- gboolean has_alpha;
-} NormalizeContrastData;
-
-
-static void
-normalize__find_min_max (guchar *src,
- gpointer extra_data)
-{
- NormalizeContrastData *data = extra_data;
- int b;
-
- for (b = 0; b < data->alpha; b++)
- if (! data->has_alpha || src[data->alpha]) {
- if (src[b] < data->min)
- data->min = src[b];
- if (src[b] > data->max)
- data->max = src[b];
- }
-}
-
-
-static void
-normalize_contrast_init (GthPixbufOp *pixop)
-{
- NormalizeContrastData *data = pixop->data;
- int range;
-
- data->has_alpha = gdk_pixbuf_get_has_alpha (pixop->src);
- data->alpha = gdk_pixbuf_get_n_channels (pixop->src);
-
- data->min = 255;
- data->max = 0;
- _gdk_pixbuf_iterate (pixop->src, data, normalize__find_min_max);
-
- /* Calculate LUT */
-
- range = data->max - data->min;
-
- if (range != 0) {
- int x;
- for (x = data->min; x <= data->max; x++)
- data->lut[x] = 255 * (x - data->min) / range;
- } else
- data->lut[data->min] = data->min;
-}
-
-
-static void
-normalize_contrast_step (GthPixbufOp *pixop)
-{
- NormalizeContrastData *data = pixop->data;
- int b;
-
- for (b = 0; b < data->alpha; b++)
- pixop->dest_pixel[b] = data->lut[pixop->src_pixel[b]];
-
- if (data->has_alpha)
- pixop->dest_pixel[data->alpha] = pixop->src_pixel[data->alpha];
-}
-
-
-static void
-normalize_contrast_release (GthPixbufOp *pixop)
-{
- g_free (pixop->data);
-}
-
-
-GthPixbufOp*
-_gdk_pixbuf_normalize_contrast (GdkPixbuf *src,
- GdkPixbuf *dest)
-{
- NormalizeContrastData *data;
-
- data = g_new (NormalizeContrastData, 1);
-
- return gth_pixbuf_op_new (src, dest,
- normalize_contrast_init,
- normalize_contrast_step,
- normalize_contrast_release,
- data);
-}
-
-
/* -- image dithering -- */
diff --git a/libgthumb/async-pixbuf-ops.h b/libgthumb/async-pixbuf-ops.h
index 37ee2e7..6a00c3c 100644
--- a/libgthumb/async-pixbuf-ops.h
+++ b/libgthumb/async-pixbuf-ops.h
@@ -59,10 +59,6 @@ GthPixbufOp* _gdk_pixbuf_eq_histogram (GdkPixbuf *src,
GdkPixbuf *dest);
GthPixbufOp* _gdk_pixbuf_adjust_levels (GdkPixbuf *src,
GdkPixbuf *dest);
-GthPixbufOp* _gdk_pixbuf_stretch_contrast (GdkPixbuf *src,
- GdkPixbuf *dest);
-GthPixbufOp* _gdk_pixbuf_normalize_contrast (GdkPixbuf *src,
- GdkPixbuf *dest);
GthPixbufOp* _gdk_pixbuf_dither (GdkPixbuf *src,
GdkPixbuf *dest,
GthDither dither_type);
diff --git a/libgthumb/bookmarks.c b/libgthumb/bookmarks.c
index 1144700..ad64d0c 100644
--- a/libgthumb/bookmarks.c
+++ b/libgthumb/bookmarks.c
@@ -438,9 +438,3 @@ bookmarks_set_max_lines (Bookmarks *bookmarks,
bookmarks->max_lines = max_lines;
}
-
-int
-bookmarks_get_max_lines (Bookmarks *bookmarks)
-{
- return bookmarks->max_lines;
-}
diff --git a/libgthumb/bookmarks.h b/libgthumb/bookmarks.h
index 7950349..6f01ebb 100644
--- a/libgthumb/bookmarks.h
+++ b/libgthumb/bookmarks.h
@@ -69,8 +69,6 @@ const char * bookmarks_get_menu_tip (Bookmarks *bookmarks,
void bookmarks_set_max_lines (Bookmarks *bookmarks,
int max_lines);
-int bookmarks_get_max_lines (Bookmarks *bookmarks);
-
char * bookmarks_utils__get_menu_item_name (const char *path);
diff --git a/libgthumb/catalog.c b/libgthumb/catalog.c
index 09ca523..0093f29 100644
--- a/libgthumb/catalog.c
+++ b/libgthumb/catalog.c
@@ -103,14 +103,6 @@ catalog_set_search_data (Catalog *catalog,
}
-gboolean
-catalog_is_search_result (Catalog *catalog)
-{
- g_return_val_if_fail (catalog != NULL, FALSE);
- return (catalog->search_data != NULL);
-}
-
-
static void
copy_unquoted (char *unquoted, char *line)
{
@@ -497,16 +489,6 @@ catalog_remove_item (Catalog *catalog,
}
-void
-catalog_remove_all_items (Catalog *catalog)
-{
- g_return_if_fail (catalog != NULL);
-
- path_list_free (catalog->list);
- catalog->list = NULL;
-}
-
-
/* -- catalog_get_file_data_list -- */
diff --git a/libgthumb/catalog.h b/libgthumb/catalog.h
index 176ec17..aafa3bd 100644
--- a/libgthumb/catalog.h
+++ b/libgthumb/catalog.h
@@ -47,7 +47,6 @@ void catalog_set_path (Catalog *catalog,
char *full_path);
void catalog_set_search_data (Catalog *catalog,
SearchData *search_data);
-gboolean catalog_is_search_result (Catalog *catalog);
gboolean catalog_load_from_disk (Catalog *catalog,
const char *full_path,
GError **error);
@@ -63,7 +62,6 @@ void catalog_insert_items (Catalog *catalog,
int pos);
int catalog_remove_item (Catalog *catalog,
const char *file_path);
-void catalog_remove_all_items (Catalog *catalog);
void catalog_get_file_data_list (Catalog *catalog,
CatalogDoneFunc done_func,
gpointer done_data);
diff --git a/libgthumb/file-data.c b/libgthumb/file-data.c
index 369eaa5..0aa336f 100644
--- a/libgthumb/file-data.c
+++ b/libgthumb/file-data.c
@@ -307,21 +307,6 @@ file_data_list_from_uri_list (GList *list)
GList*
-uri_list_from_file_data_list (GList *list)
-{
- GList *result = NULL;
- GList *scan;
-
- for (scan = list; scan; scan = scan->next) {
- FileData *fd = scan->data;
- result = g_list_prepend (result, g_strdup (fd->utf8_path));
- }
-
- return g_list_reverse (result);
-}
-
-
-GList*
file_data_list_dup (GList *list)
{
GList *new_list = NULL, *scan;
diff --git a/libgthumb/file-data.h b/libgthumb/file-data.h
index a55ce83..0e37ba3 100644
--- a/libgthumb/file-data.h
+++ b/libgthumb/file-data.h
@@ -79,7 +79,6 @@ void file_data_update_comment (FileData *fd);
CommentData* file_data_get_comment (FileData *fd,
gboolean try_embedded);
GList* file_data_list_from_uri_list (GList *list);
-GList* uri_list_from_file_data_list (GList *list);
GList* file_data_list_dup (GList *list);
void file_data_list_free (GList *list);
GList* file_data_list_find_path (GList *list,
diff --git a/libgthumb/glib-utils.c b/libgthumb/glib-utils.c
index d0e8cc8..7105037 100644
--- a/libgthumb/glib-utils.c
+++ b/libgthumb/glib-utils.c
@@ -308,23 +308,6 @@ _g_utf8_strstrip (const char *str)
}
-gboolean
-_g_utf8_all_spaces (const char *utf8_string)
-{
- gunichar c;
-
- c = g_utf8_get_char (utf8_string);
- while (c != 0) {
- if (! g_unichar_isspace (c))
- return FALSE;
- utf8_string = g_utf8_next_char (utf8_string);
- c = g_utf8_get_char (utf8_string);
- }
-
- return TRUE;
-}
-
-
void
debug (const char *file,
int line,
diff --git a/libgthumb/glib-utils.h b/libgthumb/glib-utils.h
index 382d7a8..35bb742 100644
--- a/libgthumb/glib-utils.h
+++ b/libgthumb/glib-utils.h
@@ -53,7 +53,6 @@ char * _g_utf8_strndup (const char *str,
char ** _g_utf8_strsplit (const char *str,
gunichar delimiter);
char * _g_utf8_strstrip (const char *str);
-gboolean _g_utf8_all_spaces (const char *utf8_string);
int strcmp_null_tolerant (const char *s1, const char *s2);
GList * _g_list_insert_list_before (GList *list1,
GList *sibling,
diff --git a/libgthumb/gth-exif-utils.c b/libgthumb/gth-exif-utils.c
index 56561b4..4b48443 100644
--- a/libgthumb/gth-exif-utils.c
+++ b/libgthumb/gth-exif-utils.c
@@ -297,25 +297,6 @@ get_orientation_from_fd (FileData *fd)
char *
-get_metadata_string (FileData *fd, const char *tagname)
-{
- char *string = NULL;
-
- /* Searches for one (and only one) tag name */
-
- update_metadata (fd);
-
- GList *search_result = g_list_find_custom (fd->metadata, tagname, (GCompareFunc) metadata_search);
- if (search_result != NULL) {
- GthMetadata *md_entry = search_result->data;
- string = g_strdup (md_entry->formatted_value);
- }
-
- return string;
-}
-
-
-char *
get_metadata_tagset_string (FileData *fd, const char *tagnames[])
{
int i;
diff --git a/libgthumb/gth-exif-utils.h b/libgthumb/gth-exif-utils.h
index ec4d890..3c3f823 100644
--- a/libgthumb/gth-exif-utils.h
+++ b/libgthumb/gth-exif-utils.h
@@ -88,8 +88,6 @@ time_t get_metadata_time_from_fd (FileData *fd,
time_t get_metadata_time (const char *mime_type,
const char *uri,
GList *md);
-char * get_metadata_string (FileData *fd,
- const char *tagname);
char * get_metadata_tagset_string (FileData *fd,
const char *tagnames[]);
GSList * get_metadata_tagset_list (FileData *fd,
diff --git a/libgthumb/gth-file-list.c b/libgthumb/gth-file-list.c
index db3743c..97a0a75 100644
--- a/libgthumb/gth-file-list.c
+++ b/libgthumb/gth-file-list.c
@@ -493,14 +493,6 @@ gth_file_list_update_icon_theme (GthFileList *file_list)
}
-void
-gth_file_list_show_hidden_files (GthFileList *file_list,
- gboolean show)
-{
- file_list->priv->show_dot_files = show;
-}
-
-
void
gth_file_list_ignore_hidden_thumbs (GthFileList *file_list,
gboolean ignore)
@@ -969,13 +961,6 @@ gth_file_list_new (void)
}
-GtkWidget *
-gth_file_list_get_widget (GthFileList *file_list)
-{
- return file_list->root_widget;
-}
-
-
GthFileView*
gth_file_list_get_view (GthFileList *file_list)
{
@@ -1421,14 +1406,6 @@ gth_file_list_get_all_from_view (GthFileList *file_list)
}
-int
-gth_file_list_get_length (GthFileList *file_list)
-{
- g_return_val_if_fail (file_list != NULL, 0);
- return g_list_length (file_list->list);
-}
-
-
GList *
gth_file_list_get_selection (GthFileList *file_list)
{
@@ -1443,22 +1420,6 @@ gth_file_list_get_selection_as_fd (GthFileList *file_list)
}
-int
-gth_file_list_get_selection_length (GthFileList *file_list)
-{
- GList *sel_list;
- int len;
-
- g_return_val_if_fail (file_list != NULL, 0);
-
- sel_list = gth_file_view_get_selection (file_list->view);
- len = g_list_length (sel_list);
- file_data_list_free (sel_list);
-
- return len;
-}
-
-
gchar *
gth_file_list_path_from_pos (GthFileList *file_list,
int pos)
@@ -1523,14 +1484,6 @@ gth_file_list_select_image_by_pos (GthFileList *file_list,
void
-gth_file_list_select_all (GthFileList *file_list)
-{
- g_return_if_fail (file_list != NULL);
- gth_file_view_select_all (file_list->view);
-}
-
-
-void
gth_file_list_unselect_all (GthFileList *file_list)
{
g_return_if_fail (file_list != NULL);
@@ -1765,16 +1718,6 @@ gfl_update_thumb (GthFileList *file_list,
}
-void
-gth_file_list_update_thumb (GthFileList *file_list,
- const char *uri)
-{
- gth_file_list_queue_op_with_uri (file_list,
- GTH_FILE_LIST_OP_TYPE_UPDATE_THUMB,
- uri);
-}
-
-
static void
gfl_update_thumb_list (GthFileList *file_list,
GList *list)
diff --git a/libgthumb/gth-file-list.h b/libgthumb/gth-file-list.h
index 52a5368..231359c 100644
--- a/libgthumb/gth-file-list.h
+++ b/libgthumb/gth-file-list.h
@@ -64,7 +64,6 @@ struct _GthFileListClass {
GType gth_file_list_get_type (void);
GthFileList* gth_file_list_new (void);
-GtkWidget* gth_file_list_get_widget (GthFileList *file_list);
GthFileView* gth_file_list_get_view (GthFileList *file_list);
void gth_file_list_set_list (GthFileList *file_list,
GList *new_list,
@@ -89,17 +88,14 @@ int gth_file_list_pos_from_path (GthFileList *file_list,
const char *path);
GList* gth_file_list_get_all (GthFileList *file_list);
GList* gth_file_list_get_all_from_view (GthFileList *file_list);
-int gth_file_list_get_length (GthFileList *file_list);
GList* gth_file_list_get_selection (GthFileList *file_list);
GList* gth_file_list_get_selection_as_fd (GthFileList *file_list);
-int gth_file_list_get_selection_length (GthFileList *file_list);
char* gth_file_list_path_from_pos (GthFileList *file_list,
int pos);
gboolean gth_file_list_is_selected (GthFileList *file_list,
int pos);
void gth_file_list_select_image_by_pos (GthFileList *file_list,
int pos);
-void gth_file_list_select_all (GthFileList *file_list);
void gth_file_list_unselect_all (GthFileList *file_list);
void gth_file_list_enable_thumbs (GthFileList *file_list,
gboolean enable,
@@ -122,8 +118,6 @@ void gth_file_list_rename (GthFileList *file_list,
const char *to_uri);
void gth_file_list_update_comment (GthFileList *file_list,
const char *uri);
-void gth_file_list_update_thumb (GthFileList *file_list,
- const char *uri);
void gth_file_list_update_thumb_list (GthFileList *file_list,
GList *list /*path list*/);
void gth_file_list_restart_thumbs (GthFileList *file_list,
@@ -133,8 +127,6 @@ void gth_file_list_set_thumbs_size (GthFileList *file_list,
void gth_file_list_set_filter (GthFileList *file_list,
GthFilter *filter);
void gth_file_list_update_icon_theme (GthFileList *file_list);
-void gth_file_list_show_hidden_files (GthFileList *file_list,
- gboolean show);
void gth_file_list_ignore_hidden_thumbs (GthFileList *file_list,
gboolean ignore);
diff --git a/libgthumb/gth-file-view-list.c b/libgthumb/gth-file-view-list.c
index cef1194..c7612be 100644
--- a/libgthumb/gth-file-view-list.c
+++ b/libgthumb/gth-file-view-list.c
@@ -71,38 +71,6 @@ struct _GthFileViewListPrivate {
static GthFileViewClass *parent_class;
-static void
-gfv_set_hadjustment (GthFileView *file_view,
- GtkAdjustment *hadj)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeView *tree_view = gfv_list->priv->tree_view;
-
- gtk_tree_view_set_hadjustment (tree_view, hadj);
-}
-
-
-static GtkAdjustment *
-gfv_get_hadjustment (GthFileView *file_view)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeView *tree_view = gfv_list->priv->tree_view;
-
- return gtk_tree_view_get_hadjustment (tree_view);
-}
-
-
-static void
-gfv_set_vadjustment (GthFileView *file_view,
- GtkAdjustment *vadj)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeView *tree_view = gfv_list->priv->tree_view;
-
- gtk_tree_view_set_vadjustment (tree_view, vadj);
-}
-
-
static GtkAdjustment *
gfv_get_vadjustment (GthFileView *file_view)
{
@@ -210,73 +178,6 @@ get_sized_pixbuf (GthFileViewList *gfv_list,
}
-static void
-gfv_insert (GthFileView *file_view,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkListStore *list_store = gfv_list->priv->list_store;
- GtkTreeIter iter;
- GdkPixbuf *real_pixbuf;
-
- g_return_if_fail (pixbuf != NULL);
-
- real_pixbuf = get_sized_pixbuf (gfv_list, pixbuf);
-
- gtk_list_store_insert (list_store, &iter, pos);
- gtk_list_store_set (list_store, &iter,
- COLUMN_ICON, real_pixbuf,
- COLUMN_NAME, text,
- COLUMN_COMMENT, comment,
- COLUMN_TAGS, tags,
- -1);
-
- if (real_pixbuf != NULL)
- g_object_unref (real_pixbuf);
-}
-
-
-static int
-gfv_append (GthFileView *file_view,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkListStore *list_store = gfv_list->priv->list_store;
- GtkTreeIter iter;
- GdkPixbuf *real_pixbuf;
- GtkTreePath *path;
- int pos;
-
- g_return_val_if_fail (pixbuf != NULL, -1);
-
- real_pixbuf = get_sized_pixbuf (gfv_list, pixbuf);
-
- gtk_list_store_append (list_store, &iter);
- gtk_list_store_set (list_store, &iter,
- COLUMN_ICON, real_pixbuf,
- COLUMN_NAME, text,
- COLUMN_COMMENT, comment,
- COLUMN_TAGS, tags,
- -1);
-
- if (real_pixbuf != NULL)
- g_object_unref (real_pixbuf);
-
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (gfv_list->priv->list_store), &iter);
- pos = gtk_tree_path_get_indices (path)[0];
- gtk_tree_path_free (path);
-
- return pos;
-}
-
-
static int
gfv_append_with_data (GthFileView *file_view,
GdkPixbuf *pixbuf,
@@ -412,32 +313,6 @@ gfv_set_image_text (GthFileView *file_view,
}
-static const char*
-gfv_get_image_text (GthFileView *file_view,
- int pos)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeIter iter;
- GtkTreePath *path;
- char *text = NULL;
-
- path = gtk_tree_path_new_from_indices (pos, -1);
- if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (gfv_list->priv->filter_model),
- &iter,
- path)) {
- gtk_tree_path_free (path);
- return NULL;
- }
- gtk_tree_path_free (path);
-
- gtk_tree_model_get (GTK_TREE_MODEL (gfv_list->priv->filter_model), &iter,
- COLUMN_NAME, &text,
- -1);
-
- return text;
-}
-
-
static void
gfv_set_image_comment (GthFileView *file_view,
int pos,
@@ -472,32 +347,6 @@ gfv_set_image_tags (GthFileView *file_view,
}
-static const char*
-gfv_get_image_comment (GthFileView *file_view,
- int pos)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeIter iter;
- GtkTreePath *path;
- char *comment = NULL;
-
- path = gtk_tree_path_new_from_indices (pos, -1);
- if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (gfv_list->priv->filter_model),
- &iter,
- path)) {
- gtk_tree_path_free (path);
- return NULL;
- }
- gtk_tree_path_free (path);
-
- gtk_tree_model_get (GTK_TREE_MODEL (gfv_list->priv->filter_model), &iter,
- COLUMN_COMMENT, &comment,
- -1);
-
- return comment;
-}
-
-
static int
gfv_get_images (GthFileView *file_view)
{
@@ -589,21 +438,6 @@ gfv_select_image (GthFileView *file_view,
static void
-gfv_unselect_image (GthFileView *file_view,
- int pos)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeSelection *selection;
- GtkTreePath *path;
-
- selection = gtk_tree_view_get_selection (gfv_list->priv->tree_view);
- path = gtk_tree_path_new_from_indices (pos, -1);
- gtk_tree_selection_unselect_path (selection, path);
- gtk_tree_path_free (path);
-}
-
-
-static void
gfv_select_all (GthFileView *file_view)
{
GthFileViewList *gfv_list = (GthFileViewList *) file_view;
@@ -683,70 +517,6 @@ gfv_pos_is_selected (GthFileView *file_view,
static int
-gfv_get_first_selected (GthFileView *file_view)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeSelection *selection;
- GList *sel_rows, *scan;
- int min = -1;
-
- selection = gtk_tree_view_get_selection (gfv_list->priv->tree_view);
- sel_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
-
- if (sel_rows == NULL)
- return -1;
-
- for (scan = sel_rows; scan; scan = scan->next) {
- GtkTreePath *path = scan->data;
- int pos;
-
- pos = gtk_tree_path_get_indices (path)[0];
- if (min == -1)
- min = pos;
- else
- min = MIN (min, pos);
- }
-
- g_list_foreach (sel_rows, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (sel_rows);
-
- return min;
-}
-
-
-static int
-gfv_get_last_selected (GthFileView *file_view)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeSelection *selection;
- GList *sel_rows, *scan;
- int max = -1;
-
- selection = gtk_tree_view_get_selection (gfv_list->priv->tree_view);
- sel_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
-
- if (sel_rows == NULL)
- return -1;
-
- for (scan = sel_rows; scan; scan = scan->next) {
- GtkTreePath *path = scan->data;
- int pos;
-
- pos = gtk_tree_path_get_indices (path)[0];
- if (max == -1)
- max = pos;
- else
- max = MAX (max, pos);
- }
-
- g_list_foreach (sel_rows, (GFunc) gtk_tree_path_free, NULL);
- g_list_free (sel_rows);
-
- return max;
-}
-
-
-static int
gfv_get_n_selected (GthFileView *file_view)
{
GthFileViewList *gfv_list = (GthFileViewList *) file_view;
@@ -781,23 +551,6 @@ gfv_set_image_width (GthFileView *file_view,
/* Attaching information to the items */
-static void
-gfv_set_image_data (GthFileView *file_view,
- int pos,
- gpointer data)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeIter iter;
-
- if (! get_list_store_iter_from_pos (gfv_list, pos, &iter))
- return;
-
- gtk_list_store_set (gfv_list->priv->list_store, &iter,
- COLUMN_FILE_DATA, data,
- -1);
-}
-
-
static int
gfv_find_image_from_data (GthFileView *file_view,
gpointer data)
@@ -887,14 +640,6 @@ gfv_set_view_mode (GthFileView *file_view,
}
-static int
-gfv_get_view_mode (GthFileView *file_view)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- return gfv_list->priv->view_mode;
-}
-
-
static void
gfv_moveto (GthFileView *file_view,
int pos,
@@ -1115,19 +860,6 @@ gfv_unsorted (GthFileView *file_view)
static void
-gfv_image_activated (GthFileView *file_view,
- int pos)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreePath *path;
-
- path = gtk_tree_path_new_from_indices (pos, -1);
- gtk_tree_view_row_activated (gfv_list->priv->tree_view, path, NULL);
- gtk_tree_path_free (path);
-}
-
-
-static void
gfv_set_cursor (GthFileView *file_view,
int pos)
{
@@ -1239,30 +971,6 @@ gfv_get_reorderable (GthFileView *file_view)
}
-/* Interactive search */
-
-
-static void
-gfv_set_enable_search (GthFileView *file_view,
- gboolean enable_search)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeView *tree_view = gfv_list->priv->tree_view;
-
- gtk_tree_view_set_enable_search (tree_view, enable_search);
-}
-
-
-static gboolean
-gfv_get_enable_search (GthFileView *file_view)
-{
- GthFileViewList *gfv_list = (GthFileViewList *) file_view;
- GtkTreeView *tree_view = gfv_list->priv->tree_view;
-
- return gtk_tree_view_get_enable_search (tree_view);
-}
-
-
/**/
@@ -1319,42 +1027,30 @@ gth_file_view_list_class_init (GthFileViewListClass *file_view_list_class)
gobject_class->finalize = gth_file_view_list_finalize;
- file_view_class->set_hadjustment = gfv_set_hadjustment;
- file_view_class->get_hadjustment = gfv_get_hadjustment;
- file_view_class->set_vadjustment = gfv_set_vadjustment;
file_view_class->get_vadjustment = gfv_get_vadjustment;
file_view_class->get_widget = gfv_get_widget;
file_view_class->get_drag_source = gfv_get_drag_source;
- file_view_class->insert = gfv_insert;
- file_view_class->append = gfv_append;
file_view_class->append_with_data = gfv_append_with_data;
file_view_class->remove = gfv_remove;
file_view_class->clear = gfv_clear;
file_view_class->set_image_pixbuf = gfv_set_image_pixbuf;
file_view_class->set_image_text = gfv_set_image_text;
- file_view_class->get_image_text = gfv_get_image_text;
file_view_class->set_image_comment = gfv_set_image_comment;
file_view_class->set_image_tags = gfv_set_image_tags;
- file_view_class->get_image_comment = gfv_get_image_comment;
file_view_class->get_images = gfv_get_images;
file_view_class->get_list = gfv_get_list;
file_view_class->get_selection = gfv_get_selection;
file_view_class->select_image = gfv_select_image;
- file_view_class->unselect_image = gfv_unselect_image;
file_view_class->select_all = gfv_select_all;
file_view_class->unselect_all = gfv_unselect_all;
file_view_class->get_file_list_selection = gfv_get_file_list_selection;
file_view_class->pos_is_selected = gfv_pos_is_selected;
- file_view_class->get_first_selected = gfv_get_first_selected;
- file_view_class->get_last_selected = gfv_get_last_selected;
file_view_class->get_n_selected = gfv_get_n_selected;
file_view_class->set_image_width = gfv_set_image_width;
- file_view_class->set_image_data = gfv_set_image_data;
file_view_class->find_image_from_data = gfv_find_image_from_data;
file_view_class->get_image_data = gfv_get_image_data;
file_view_class->enable_thumbs = gfv_enable_thumbs;
file_view_class->set_view_mode = gfv_set_view_mode;
- file_view_class->get_view_mode = gfv_get_view_mode;
file_view_class->moveto = gfv_moveto;
file_view_class->image_is_visible = gfv_image_is_visible;
file_view_class->get_image_at = gfv_get_image_at;
@@ -1363,15 +1059,12 @@ gth_file_view_list_class_init (GthFileViewListClass *file_view_list_class)
file_view_class->set_visible_func = gfv_set_visible_func;
file_view_class->sorted = gfv_sorted;
file_view_class->unsorted = gfv_unsorted;
- file_view_class->image_activated = gfv_image_activated;
file_view_class->set_cursor = gfv_set_cursor;
file_view_class->get_cursor = gfv_get_cursor;
file_view_class->set_drag_dest_pos = gfv_set_drag_dest_pos;
file_view_class->get_drag_dest_pos = gfv_get_drag_dest_pos;
file_view_class->set_reorderable = gfv_set_reorderable;
file_view_class->get_reorderable = gfv_get_reorderable;
- file_view_class->set_enable_search = gfv_set_enable_search;
- file_view_class->get_enable_search = gfv_get_enable_search;
}
diff --git a/libgthumb/gth-file-view-thumbs.c b/libgthumb/gth-file-view-thumbs.c
index 51685b3..676f185 100644
--- a/libgthumb/gth-file-view-thumbs.c
+++ b/libgthumb/gth-file-view-thumbs.c
@@ -40,38 +40,6 @@ struct _GthFileViewThumbsPrivate {
static GthFileViewClass *parent_class;
-static void
-gfv_set_hadjustment (GthFileView *file_view,
- GtkAdjustment *hadj)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- gth_image_list_set_hadjustment (ilist, hadj);
-}
-
-
-static GtkAdjustment *
-gfv_get_hadjustment (GthFileView *file_view)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- return gth_image_list_get_hadjustment (ilist);
-}
-
-
-static void
-gfv_set_vadjustment (GthFileView *file_view,
- GtkAdjustment *vadj)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- gth_image_list_set_vadjustment (ilist, vadj);
-}
-
-
static GtkAdjustment *
gfv_get_vadjustment (GthFileView *file_view)
{
@@ -127,39 +95,6 @@ gfv_is_frozen (GthFileView *file_view)
/**/
-static void
-gfv_insert (GthFileView *file_view,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- g_return_if_fail (pixbuf != NULL);
-
- gth_image_list_insert (ilist, pos, pixbuf, text, comment, tags);
-}
-
-
-static int
-gfv_append (GthFileView *file_view,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- g_return_val_if_fail (pixbuf != NULL, -1);
-
- return gth_image_list_append (ilist, pixbuf, text, comment, tags);
-}
-
-
static int
gfv_append_with_data (GthFileView *file_view,
GdkPixbuf *pixbuf,
@@ -222,17 +157,6 @@ gfv_set_image_text (GthFileView *file_view,
}
-static const char*
-gfv_get_image_text (GthFileView *file_view,
- int pos)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- return gth_image_list_get_image_text (ilist, pos);
-}
-
-
static void
gfv_set_image_comment (GthFileView *file_view,
int pos,
@@ -257,17 +181,6 @@ gfv_set_image_tags (GthFileView *file_view,
}
-static const char*
-gfv_get_image_comment (GthFileView *file_view,
- int pos)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- return gth_image_list_get_image_comment (ilist, pos);
-}
-
-
static int
gfv_get_images (GthFileView *file_view)
{
@@ -313,17 +226,6 @@ gfv_select_image (GthFileView *file_view,
static void
-gfv_unselect_image (GthFileView *file_view,
- int pos)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- gth_image_list_unselect_image (ilist, pos);
-}
-
-
-static void
gfv_select_all (GthFileView *file_view)
{
GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
@@ -376,26 +278,6 @@ gfv_pos_is_selected (GthFileView *file_view,
static int
-gfv_get_first_selected (GthFileView *file_view)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- return gth_image_list_get_first_selected (ilist);
-}
-
-
-static int
-gfv_get_last_selected (GthFileView *file_view)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- return gth_image_list_get_last_selected (ilist);
-}
-
-
-static int
gfv_get_n_selected (GthFileView *file_view)
{
GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
@@ -422,18 +304,6 @@ gfv_set_image_width (GthFileView *file_view,
/* Attaching information to the items */
-static void
-gfv_set_image_data (GthFileView *file_view,
- int pos,
- gpointer data)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- gth_image_list_set_image_data (ilist, pos, data);
-}
-
-
static int
gfv_find_image_from_data (GthFileView *file_view,
gpointer data)
@@ -481,16 +351,6 @@ gfv_set_view_mode (GthFileView *file_view,
}
-static int
-gfv_get_view_mode (GthFileView *file_view)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- return gth_image_list_get_view_mode (ilist);
-}
-
-
static void
gfv_moveto (GthFileView *file_view,
int pos,
@@ -725,17 +585,6 @@ gfv_unsorted (GthFileView *file_view)
static void
-gfv_image_activated (GthFileView *file_view,
- int pos)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- gth_image_list_image_activated (ilist, pos);
-}
-
-
-static void
gfv_set_cursor (GthFileView *file_view,
int pos)
{
@@ -824,30 +673,6 @@ gfv_get_reorderable (GthFileView *file_view)
}
-/* Interactive search */
-
-
-static void
-gfv_set_enable_search (GthFileView *file_view,
- gboolean enable_search)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- gth_image_list_set_enable_search (ilist, enable_search);
-}
-
-
-static gboolean
-gfv_get_enable_search (GthFileView *file_view)
-{
- GthFileViewThumbs *gfv_thumbs = (GthFileViewThumbs *) file_view;
- GthImageList *ilist = gfv_thumbs->priv->ilist;
-
- return gth_image_list_get_enable_search (ilist);
-}
-
-
/**/
@@ -881,44 +706,32 @@ gth_file_view_thumbs_class_init (GthFileViewThumbsClass *file_view_thumbs_class)
gobject_class->finalize = gth_file_view_thumbs_finalize;
- file_view_class->set_hadjustment = gfv_set_hadjustment;
- file_view_class->get_hadjustment = gfv_get_hadjustment;
- file_view_class->set_vadjustment = gfv_set_vadjustment;
file_view_class->get_vadjustment = gfv_get_vadjustment;
file_view_class->get_widget = gfv_get_widget;
file_view_class->freeze = gfv_freeze;
file_view_class->thaw = gfv_thaw;
file_view_class->is_frozen = gfv_is_frozen;
- file_view_class->insert = gfv_insert;
- file_view_class->append = gfv_append;
file_view_class->append_with_data = gfv_append_with_data;
file_view_class->remove = gfv_remove;
file_view_class->clear = gfv_clear;
file_view_class->set_image_pixbuf = gfv_set_image_pixbuf;
file_view_class->set_image_text = gfv_set_image_text;
- file_view_class->get_image_text = gfv_get_image_text;
file_view_class->set_image_comment = gfv_set_image_comment;
file_view_class->set_image_tags = gfv_set_image_tags;
- file_view_class->get_image_comment = gfv_get_image_comment;
file_view_class->get_images = gfv_get_images;
file_view_class->get_list = gfv_get_list;
file_view_class->get_selection = gfv_get_selection;
file_view_class->select_image = gfv_select_image;
- file_view_class->unselect_image = gfv_unselect_image;
file_view_class->select_all = gfv_select_all;
file_view_class->unselect_all = gfv_unselect_all;
file_view_class->get_file_list_selection = gfv_get_file_list_selection;
file_view_class->pos_is_selected = gfv_pos_is_selected;
- file_view_class->get_first_selected = gfv_get_first_selected;
- file_view_class->get_last_selected = gfv_get_last_selected;
file_view_class->get_n_selected = gfv_get_n_selected;
file_view_class->set_image_width = gfv_set_image_width;
- file_view_class->set_image_data = gfv_set_image_data;
file_view_class->find_image_from_data = gfv_find_image_from_data;
file_view_class->get_image_data = gfv_get_image_data;
file_view_class->enable_thumbs = gfv_enable_thumbs;
file_view_class->set_view_mode = gfv_set_view_mode;
- file_view_class->get_view_mode = gfv_get_view_mode;
file_view_class->moveto = gfv_moveto;
file_view_class->image_is_visible = gfv_image_is_visible;
file_view_class->get_image_at = gfv_get_image_at;
@@ -927,7 +740,6 @@ gth_file_view_thumbs_class_init (GthFileViewThumbsClass *file_view_thumbs_class)
file_view_class->set_visible_func = gfv_set_visible_func;
file_view_class->sorted = gfv_sorted;
file_view_class->unsorted = gfv_unsorted;
- file_view_class->image_activated = gfv_image_activated;
file_view_class->set_cursor = gfv_set_cursor;
file_view_class->get_cursor = gfv_get_cursor;
file_view_class->set_no_image_text = gfv_set_no_image_text;
@@ -935,8 +747,6 @@ gth_file_view_thumbs_class_init (GthFileViewThumbsClass *file_view_thumbs_class)
file_view_class->get_drag_dest_pos = gfv_get_drag_dest_pos;
file_view_class->set_reorderable = gfv_set_reorderable;
file_view_class->get_reorderable = gfv_get_reorderable;
- file_view_class->set_enable_search = gfv_set_enable_search;
- file_view_class->get_enable_search = gfv_get_enable_search;
}
diff --git a/libgthumb/gth-file-view.c b/libgthumb/gth-file-view.c
index d4b034c..56eb1e4 100644
--- a/libgthumb/gth-file-view.c
+++ b/libgthumb/gth-file-view.c
@@ -39,27 +39,6 @@ static guint file_view_signals[LAST_SIGNAL] = { 0 };
static GObjectClass *parent_class;
-static void
-gfv_set_hadjustment (GthFileView *file_view,
- GtkAdjustment *hadj)
-{
-}
-
-
-static GtkAdjustment *
-gfv_get_hadjustment (GthFileView *file_view)
-{
- return NULL;
-}
-
-
-static void
-gfv_set_vadjustment (GthFileView *file_view,
- GtkAdjustment *vadj)
-{
-}
-
-
static GtkAdjustment *
gfv_get_vadjustment (GthFileView *file_view)
{
@@ -106,28 +85,6 @@ gfv_is_frozen (GthFileView *file_view)
/**/
-static void
-gfv_insert (GthFileView *file_view,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
-}
-
-
-static int
-gfv_append (GthFileView *file_view,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- return -1;
-}
-
-
static int
gfv_append_with_data (GthFileView *file_view,
GdkPixbuf *pixbuf,
@@ -169,14 +126,6 @@ gfv_set_image_text (GthFileView *file_view,
}
-static const char*
-gfv_get_image_text (GthFileView *file_view,
- int pos)
-{
- return NULL;
-}
-
-
static void
gfv_set_image_comment (GthFileView *file_view,
int pos,
@@ -193,14 +142,6 @@ gfv_set_image_tags (GthFileView *file_view,
}
-static const char*
-gfv_get_image_comment (GthFileView *file_view,
- int pos)
-{
- return NULL;
-}
-
-
static int
gfv_get_images (GthFileView *file_view)
{
@@ -233,13 +174,6 @@ gfv_select_image (GthFileView *file_view,
static void
-gfv_unselect_image (GthFileView *file_view,
- int pos)
-{
-}
-
-
-static void
gfv_select_all (GthFileView *file_view)
{
}
@@ -267,20 +201,6 @@ gfv_pos_is_selected (GthFileView *file_view,
static int
-gfv_get_first_selected (GthFileView *file_view)
-{
- return -1;
-}
-
-
-static int
-gfv_get_last_selected (GthFileView *file_view)
-{
- return -1;
-}
-
-
-static int
gfv_get_n_selected (GthFileView *file_view)
{
return -1;
@@ -300,14 +220,6 @@ gfv_set_image_width (GthFileView *file_view,
/* Attaching information to the items */
-static void
-gfv_set_image_data (GthFileView *file_view,
- int pos,
- gpointer data)
-{
-}
-
-
static int
gfv_find_image_from_data (GthFileView *file_view,
gpointer data)
@@ -341,13 +253,6 @@ gfv_set_view_mode (GthFileView *file_view,
}
-static int
-gfv_get_view_mode (GthFileView *file_view)
-{
- return GTH_VIEW_MODE_COMMENTS;
-}
-
-
static void
gfv_moveto (GthFileView *file_view,
int pos,
@@ -416,13 +321,6 @@ gfv_unsorted (GthFileView *file_view)
static void
-gfv_image_activated (GthFileView *file_view,
- int pos)
-{
-}
-
-
-static void
gfv_set_cursor (GthFileView *file_view,
int pos)
{
@@ -473,23 +371,6 @@ gfv_get_reorderable (GthFileView *file_view)
}
-/* Interactive search */
-
-
-static void
-gfv_set_enable_search (GthFileView *file_view,
- gboolean enable_search)
-{
-}
-
-
-static gboolean
-gfv_get_enable_search (GthFileView *file_view)
-{
- return FALSE;
-}
-
-
/**/
@@ -503,45 +384,33 @@ gth_file_view_class_init (GthFileViewClass *file_view_class)
/* Methods */
- file_view_class->set_hadjustment = gfv_set_hadjustment;
- file_view_class->get_hadjustment = gfv_get_hadjustment;
- file_view_class->set_vadjustment = gfv_set_vadjustment;
file_view_class->get_vadjustment = gfv_get_vadjustment;
file_view_class->get_widget = gfv_get_widget;
file_view_class->get_drag_source = gfv_get_drag_source;
file_view_class->freeze = gfv_freeze;
file_view_class->thaw = gfv_thaw;
file_view_class->is_frozen = gfv_is_frozen;
- file_view_class->insert = gfv_insert;
- file_view_class->append = gfv_append;
file_view_class->append_with_data = gfv_append_with_data;
file_view_class->remove = gfv_remove;
file_view_class->clear = gfv_clear;
file_view_class->set_image_pixbuf = gfv_set_image_pixbuf;
file_view_class->set_image_text = gfv_set_image_text;
- file_view_class->get_image_text = gfv_get_image_text;
file_view_class->set_image_comment = gfv_set_image_comment;
file_view_class->set_image_tags = gfv_set_image_tags;
- file_view_class->get_image_comment = gfv_get_image_comment;
file_view_class->get_images = gfv_get_images;
file_view_class->get_list = gfv_get_list;
file_view_class->get_selection = gfv_get_selection;
file_view_class->select_image = gfv_select_image;
- file_view_class->unselect_image = gfv_unselect_image;
file_view_class->select_all = gfv_select_all;
file_view_class->unselect_all = gfv_unselect_all;
file_view_class->get_file_list_selection = gfv_get_file_list_selection;
file_view_class->pos_is_selected = gfv_pos_is_selected;
- file_view_class->get_first_selected = gfv_get_first_selected;
- file_view_class->get_last_selected = gfv_get_last_selected;
file_view_class->get_n_selected = gfv_get_n_selected;
file_view_class->set_image_width = gfv_set_image_width;
- file_view_class->set_image_data = gfv_set_image_data;
file_view_class->find_image_from_data = gfv_find_image_from_data;
file_view_class->get_image_data = gfv_get_image_data;
file_view_class->enable_thumbs = gfv_enable_thumbs;
file_view_class->set_view_mode = gfv_set_view_mode;
- file_view_class->get_view_mode = gfv_get_view_mode;
file_view_class->moveto = gfv_moveto;
file_view_class->image_is_visible = gfv_image_is_visible;
file_view_class->get_image_at = gfv_get_image_at;
@@ -550,7 +419,6 @@ gth_file_view_class_init (GthFileViewClass *file_view_class)
file_view_class->set_visible_func = gfv_set_visible_func;
file_view_class->sorted = gfv_sorted;
file_view_class->unsorted = gfv_unsorted;
- file_view_class->image_activated = gfv_image_activated;
file_view_class->set_cursor = gfv_set_cursor;
file_view_class->get_cursor = gfv_get_cursor;
file_view_class->set_no_image_text = gfv_set_no_image_text;
@@ -558,8 +426,6 @@ gth_file_view_class_init (GthFileViewClass *file_view_class)
file_view_class->get_drag_dest_pos = gfv_get_drag_dest_pos;
file_view_class->set_reorderable = gfv_set_reorderable;
file_view_class->get_reorderable = gfv_get_reorderable;
- file_view_class->set_enable_search = gfv_set_enable_search;
- file_view_class->get_enable_search = gfv_get_enable_search;
/* Signals */
@@ -629,29 +495,6 @@ gth_file_view_get_type (void)
/**/
-void
-gth_file_view_set_hadjustment (GthFileView *file_view,
- GtkAdjustment *hadj)
-{
- GTH_FILE_VIEW_GET_CLASS (file_view)->set_hadjustment (file_view, hadj);
-}
-
-
-GtkAdjustment *
-gth_file_view_get_hadjustment (GthFileView *file_view)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->get_hadjustment (file_view);
-}
-
-
-void
-gth_file_view_set_vadjustment (GthFileView *file_view,
- GtkAdjustment *vadj)
-{
- GTH_FILE_VIEW_GET_CLASS (file_view)->set_vadjustment (file_view, vadj);
-}
-
-
GtkAdjustment *
gth_file_view_get_vadjustment (GthFileView *file_view)
{
@@ -700,29 +543,6 @@ gth_file_view_is_frozen (GthFileView *file_view)
/**/
-void
-gth_file_view_insert (GthFileView *file_view,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- GTH_FILE_VIEW_GET_CLASS (file_view)->insert (file_view, pos, pixbuf, text, comment, tags);
-}
-
-
-int
-gth_file_view_append (GthFileView *file_view,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->append (file_view, pixbuf, text, comment, tags);
-}
-
-
int
gth_file_view_append_with_data (GthFileView *file_view,
GdkPixbuf *pixbuf,
@@ -768,14 +588,6 @@ gth_file_view_set_image_text (GthFileView *file_view,
}
-const char*
-gth_file_view_get_image_text (GthFileView *file_view,
- int pos)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->get_image_text (file_view, pos);
-}
-
-
void
gth_file_view_set_image_comment (GthFileView *file_view,
int pos,
@@ -794,14 +606,6 @@ gth_file_view_set_image_tags (GthFileView *file_view,
}
-const char*
-gth_file_view_get_image_comment (GthFileView *file_view,
- int pos)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->get_image_comment (file_view, pos);
-}
-
-
int
gth_file_view_get_images (GthFileView *file_view)
{
@@ -835,14 +639,6 @@ gth_file_view_select_image (GthFileView *file_view,
void
-gth_file_view_unselect_image (GthFileView *file_view,
- int pos)
-{
- GTH_FILE_VIEW_GET_CLASS (file_view)->unselect_image (file_view, pos);
-}
-
-
-void
gth_file_view_select_all (GthFileView *file_view)
{
GTH_FILE_VIEW_GET_CLASS (file_view)->select_all (file_view);
@@ -872,20 +668,6 @@ gth_file_view_pos_is_selected (GthFileView *file_view,
int
-gth_file_view_get_first_selected (GthFileView *file_view)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->get_first_selected (file_view);
-}
-
-
-int
-gth_file_view_get_last_selected (GthFileView *file_view)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->get_last_selected (file_view);
-}
-
-
-int
gth_file_view_get_n_selected (GthFileView *file_view)
{
return GTH_FILE_VIEW_GET_CLASS (file_view)->get_n_selected (file_view);
@@ -906,15 +688,6 @@ gth_file_view_set_image_width (GthFileView *file_view,
/* Attaching information to the items */
-void
-gth_file_view_set_image_data (GthFileView *file_view,
- int pos,
- gpointer data)
-{
- GTH_FILE_VIEW_GET_CLASS (file_view)->set_image_data (file_view, pos, data);
-}
-
-
int
gth_file_view_find_image_from_data (GthFileView *file_view,
gpointer data)
@@ -950,13 +723,6 @@ gth_file_view_set_view_mode (GthFileView *file_view,
}
-int
-gth_file_view_get_view_mode (GthFileView *file_view)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->get_view_mode (file_view);
-}
-
-
void
gth_file_view_moveto (GthFileView *file_view,
int pos,
@@ -1029,14 +795,6 @@ gth_file_view_unsorted (GthFileView *file_view)
void
-gth_file_view_image_activated (GthFileView *file_view,
- int pos)
-{
- GTH_FILE_VIEW_GET_CLASS (file_view)->image_activated (file_view, pos);
-}
-
-
-void
gth_file_view_set_cursor (GthFileView *file_view,
int pos)
{
@@ -1094,24 +852,6 @@ gth_file_view_get_reorderable (GthFileView *file_view)
}
-/* Interactive search */
-
-
-void
-gth_file_view_set_enable_search (GthFileView *file_view,
- gboolean enable_search)
-{
- GTH_FILE_VIEW_GET_CLASS (file_view)->set_enable_search (file_view, enable_search);
-}
-
-
-gboolean
-gth_file_view_get_enable_search (GthFileView *file_view)
-{
- return GTH_FILE_VIEW_GET_CLASS (file_view)->get_enable_search (file_view);
-}
-
-
void
gth_file_view_selection_changed (GthFileView *file_view)
{
diff --git a/libgthumb/gth-file-view.h b/libgthumb/gth-file-view.h
index f6f2759..5907bdb 100644
--- a/libgthumb/gth-file-view.h
+++ b/libgthumb/gth-file-view.h
@@ -56,11 +56,6 @@ typedef struct {
/* -- Virtual Functions -- */
- void (* set_hadjustment) (GthFileView *file_view,
- GtkAdjustment *hadj);
- GtkAdjustment* (* get_hadjustment) (GthFileView *file_view);
- void (* set_vadjustment) (GthFileView *file_view,
- GtkAdjustment *vadj);
GtkAdjustment* (* get_vadjustment) (GthFileView *file_view);
GtkWidget* (* get_widget) (GthFileView *file_view);
GtkWidget* (* get_drag_source) (GthFileView *file_view);
@@ -73,17 +68,6 @@ typedef struct {
/**/
- void (* insert) (GthFileView *file_view,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags);
- int (* append) (GthFileView *file_view,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags);
int (* append_with_data) (GthFileView *file_view,
GdkPixbuf *pixbuf,
const char *text,
@@ -101,16 +85,12 @@ typedef struct {
void (* set_image_text) (GthFileView *file_view,
int pos,
const char *text);
- const char* (* get_image_text) (GthFileView *file_view,
- int pos);
void (* set_image_comment) (GthFileView *file_view,
int pos,
const char *comment);
void (* set_image_tags) (GthFileView *file_view,
int pos,
const char *tags);
- const char* (* get_image_comment) (GthFileView *file_view,
- int pos);
int (* get_images) (GthFileView *file_view);
GList * (* get_list) (GthFileView *file_view);
GList * (* get_selection) (GthFileView *file_view);
@@ -119,15 +99,11 @@ typedef struct {
void (* select_image) (GthFileView *file_view,
int pos);
- void (* unselect_image) (GthFileView *file_view,
- int pos);
void (* select_all) (GthFileView *file_view);
void (* unselect_all) (GthFileView *file_view);
GList * (* get_file_list_selection) (GthFileView *file_view);
gboolean (* pos_is_selected) (GthFileView *file_view,
int pos);
- int (* get_first_selected) (GthFileView *file_view);
- int (* get_last_selected) (GthFileView *file_view);
int (* get_n_selected) (GthFileView *file_view);
/* Setting spacing values */
@@ -137,9 +113,6 @@ typedef struct {
/* Attaching information to the items */
- void (* set_image_data) (GthFileView *file_view,
- int pos,
- gpointer data);
int (* find_image_from_data) (GthFileView *file_view,
gpointer data);
gpointer (* get_image_data) (GthFileView *file_view,
@@ -151,7 +124,6 @@ typedef struct {
gboolean enable_thumbs);
void (* set_view_mode) (GthFileView *file_view,
int mode);
- int (* get_view_mode) (GthFileView *file_view);
void (* moveto) (GthFileView *file_view,
int pos,
double yalign);
@@ -175,8 +147,6 @@ typedef struct {
/* Misc */
- void (* image_activated) (GthFileView *file_view,
- int pos);
void (* set_cursor) (GthFileView *file_view,
int pos);
int (* get_cursor) (GthFileView *file_view);
@@ -194,20 +164,10 @@ typedef struct {
gboolean value);
gboolean (* get_reorderable) (GthFileView *file_view);
- /* Interactive search */
-
- void (* set_enable_search) (GthFileView *file_view,
- gboolean enable_search);
- gboolean (* get_enable_search) (GthFileView *file_view);
} GthFileViewClass;
GType gth_file_view_get_type (void);
-void gth_file_view_set_hadjustment (GthFileView *file_view,
- GtkAdjustment *hadj);
-GtkAdjustment *gth_file_view_get_hadjustment (GthFileView *file_view);
-void gth_file_view_set_vadjustment (GthFileView *file_view,
- GtkAdjustment *vadj);
GtkAdjustment *gth_file_view_get_vadjustment (GthFileView *file_view);
GtkWidget *gth_file_view_get_widget (GthFileView *file_view);
GtkWidget *gth_file_view_get_drag_source (GthFileView *file_view);
@@ -220,17 +180,6 @@ gboolean gth_file_view_is_frozen (GthFileView *file_view);
/**/
-void gth_file_view_insert (GthFileView *file_view,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags);
-int gth_file_view_append (GthFileView *file_view,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags);
int gth_file_view_append_with_data (GthFileView *file_view,
GdkPixbuf *pixbuf,
const char *text,
@@ -248,13 +197,9 @@ void gth_file_view_set_unknown_pixbuf (GthFileView *file_view,
void gth_file_view_set_image_text (GthFileView *file_view,
int pos,
const char *text);
-const char* gth_file_view_get_image_text (GthFileView *file_view,
- int pos);
void gth_file_view_set_image_comment (GthFileView *file_view,
int pos,
const char *comment);
-const char* gth_file_view_get_image_comment (GthFileView *file_view,
- int pos);
void gth_file_view_set_image_tags (GthFileView *file_view,
int pos,
const char *tags);
@@ -266,16 +211,12 @@ GList * gth_file_view_get_selection (GthFileView *file_view);
void gth_file_view_select_image (GthFileView *file_view,
int pos);
-void gth_file_view_unselect_image (GthFileView *file_view,
- int pos);
void gth_file_view_select_all (GthFileView *file_view);
void gth_file_view_unselect_all (GthFileView *file_view);
GList * gth_file_view_get_file_list_selection (GthFileView *file_view);
gboolean gth_file_view_pos_is_selected (GthFileView *file_view,
int pos);
-int gth_file_view_get_first_selected (GthFileView *file_view);
-int gth_file_view_get_last_selected (GthFileView *file_view);
int gth_file_view_get_n_selected (GthFileView *file_view);
/* Setting spacing values */
@@ -285,9 +226,6 @@ void gth_file_view_set_image_width (GthFileView *file_view,
/* Attaching information to the items */
-void gth_file_view_set_image_data (GthFileView *file_view,
- int pos,
- gpointer data);
int gth_file_view_find_image_from_data (GthFileView *file_view,
gpointer data);
gpointer gth_file_view_get_image_data (GthFileView *file_view,
@@ -299,7 +237,6 @@ void gth_file_view_enable_thumbs (GthFileView *file_view,
gboolean enable_thumbs);
void gth_file_view_set_view_mode (GthFileView *file_view,
int mode);
-int gth_file_view_get_view_mode (GthFileView *file_view);
void gth_file_view_moveto (GthFileView *file_view,
int pos,
double yalign);
@@ -326,8 +263,6 @@ void gth_file_view_unsorted (GthFileView *file_view);
/* Misc */
-void gth_file_view_image_activated (GthFileView *file_view,
- int pos);
void gth_file_view_set_cursor (GthFileView *file_view,
int pos);
int gth_file_view_get_cursor (GthFileView *file_view);
@@ -345,12 +280,6 @@ void gth_file_view_set_reorderable (GthFileView *file_view,
gboolean value);
gboolean gth_file_view_get_reorderable (GthFileView *file_view);
-/* Interactive search */
-
-void gth_file_view_set_enable_search (GthFileView *file_view,
- gboolean enable_search);
-gboolean gth_file_view_get_enable_search (GthFileView *file_view);
-
/* Protected methods */
void gth_file_view_selection_changed (GthFileView *file_view);
diff --git a/libgthumb/gth-filter.c b/libgthumb/gth-filter.c
index 861ad59..19b4fa4 100644
--- a/libgthumb/gth-filter.c
+++ b/libgthumb/gth-filter.c
@@ -117,13 +117,6 @@ gth_test_new_with_date (GthTestScope scope,
void
-gth_test_ref (GthTest *test)
-{
- test->ref_count++;
-}
-
-
-void
gth_test_unref (GthTest *test)
{
test->ref_count--;
@@ -460,51 +453,6 @@ gth_filter_new (void)
void
-gth_filter_set_max_images (GthFilter *filter,
- int max_images)
-{
- filter->priv->max_images = max_images;
-}
-
-
-int
-gth_filter_get_max_images (GthFilter *filter)
-{
- return filter->priv->max_images;
-}
-
-
-void
-gth_filter_set_max_size (GthFilter *filter,
- goffset max_size)
-{
- filter->priv->max_size = max_size;
-}
-
-
-goffset
-gth_filter_get_max_size (GthFilter *filter)
-{
- return filter->priv->max_size;
-}
-
-
-void
-gth_filter_set_match_all (GthFilter *filter,
- gboolean match_all)
-{
- filter->priv->match_all_tests = match_all;
-}
-
-
-gboolean
-gth_filter_get_match_all (GthFilter *filter)
-{
- return filter->priv->match_all_tests;
-}
-
-
-void
gth_filter_add_test (GthFilter *filter,
GthTest *test)
{
diff --git a/libgthumb/gth-filter.h b/libgthumb/gth-filter.h
index e70cb0c..61ce8a5 100644
--- a/libgthumb/gth-filter.h
+++ b/libgthumb/gth-filter.h
@@ -91,7 +91,6 @@ GthTest * gth_test_new_with_date (GthTestScope scope,
GthTestOp op,
gboolean negavite,
GDate *date);
-void gth_test_ref (GthTest *test);
void gth_test_unref (GthTest *test);
gboolean gth_test_match (GthTest *test,
FileData *fdata);
@@ -100,15 +99,6 @@ gboolean gth_test_match (GthTest *test,
GType gth_filter_get_type (void) G_GNUC_CONST;
GthFilter * gth_filter_new (void);
-void gth_filter_set_max_images (GthFilter *filter,
- int max_images);
-int gth_filter_get_max_images (GthFilter *filter);
-void gth_filter_set_max_size (GthFilter *filter,
- goffset max_size);
-goffset gth_filter_get_max_size (GthFilter *filter);
-void gth_filter_set_match_all (GthFilter *filter,
- gboolean match_all);
-gboolean gth_filter_get_match_all (GthFilter *filter);
void gth_filter_add_test (GthFilter *filter,
GthTest *test);
void gth_filter_reset (GthFilter *filter);
diff --git a/libgthumb/gth-image-list.c b/libgthumb/gth-image-list.c
index 9948d46..48e475a 100644
--- a/libgthumb/gth-image-list.c
+++ b/libgthumb/gth-image-list.c
@@ -1996,18 +1996,6 @@ gth_image_list_set_hadjustment (GthImageList *image_list,
}
-GtkAdjustment *
-gth_image_list_get_hadjustment (GthImageList *image_list)
-{
- g_return_val_if_fail (GTH_IS_IMAGE_LIST (image_list), NULL);
-
- if (image_list->priv->hadjustment == NULL)
- gth_image_list_set_hadjustment (image_list, NULL);
-
- return image_list->priv->hadjustment;
-}
-
-
void
gth_image_list_set_vadjustment (GthImageList *image_list,
GtkAdjustment *adjustment)
@@ -2431,40 +2419,6 @@ gth_image_list_pos_is_selected (GthImageList *image_list,
int
-gth_image_list_get_first_selected (GthImageList *image_list)
-{
- GList *scan = image_list->priv->selection;
- int pos;
-
- if (scan == NULL)
- return -1;
-
- pos = GPOINTER_TO_INT (scan->data);
- for (scan = scan->next; scan; scan = scan->next)
- pos = MIN (pos, GPOINTER_TO_INT (scan->data));
-
- return pos;
-}
-
-
-int
-gth_image_list_get_last_selected (GthImageList *image_list)
-{
- GList *scan = image_list->priv->selection;
- int pos;
-
- if (scan == NULL)
- return -1;
-
- pos = GPOINTER_TO_INT (scan->data);
- for (scan = scan->next; scan; scan = scan->next)
- pos = MAX (pos, GPOINTER_TO_INT (scan->data));
-
- return pos;
-}
-
-
-int
gth_image_list_get_n_selected (GthImageList *image_list)
{
return g_list_length (image_list->priv->selection);
@@ -3845,29 +3799,6 @@ truncate_comment_if_needed (GthImageList *image_list,
}
-void
-gth_image_list_insert (GthImageList *image_list,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- GthImageListItem *item;
- char *comment2;
-
- g_return_if_fail (image_list != NULL);
- g_return_if_fail (pixbuf != NULL);
- g_return_if_fail ((pos >= 0) && (pos <= image_list->priv->n_images));
-
- comment2 = truncate_comment_if_needed (image_list, comment);
- item = gth_image_list_item_new (image_list, pixbuf, text, comment2, tags, image_list->priv->data_type);
- g_free (comment2);
-
- image_list_insert_item (image_list, item, pos);
-}
-
-
int
gth_image_list_append_with_data (GthImageList *image_list,
GdkPixbuf *pixbuf,
@@ -3905,17 +3836,6 @@ gth_image_list_append_with_data (GthImageList *image_list,
}
-int
-gth_image_list_append (GthImageList *image_list,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags)
-{
- return gth_image_list_append_with_data (image_list, pixbuf, text, comment, tags, NULL);
-}
-
-
static int
find_link_from_data (GList *image_list,
gpointer data,
@@ -4163,38 +4083,6 @@ gth_image_list_set_image_tags (GthImageList *image_list,
}
-const char *
-gth_image_list_get_image_text (GthImageList *image_list,
- int pos)
-{
- GthImageListItem *item;
-
- g_return_val_if_fail (image_list != NULL, NULL);
- g_return_val_if_fail ((pos >= 0) && (pos < image_list->priv->n_images), NULL);
-
- item = g_list_nth (image_list->priv->image_list, pos)->data;
- g_return_val_if_fail (item != NULL, NULL);
-
- return item->label;
-}
-
-
-const char *
-gth_image_list_get_image_comment (GthImageList *image_list,
- int pos)
-{
- GthImageListItem *item;
-
- g_return_val_if_fail (image_list != NULL, NULL);
- g_return_val_if_fail ((pos >= 0) && (pos < image_list->priv->n_images), NULL);
-
- item = g_list_nth (image_list->priv->image_list, pos)->data;
- g_return_val_if_fail (item != NULL, NULL);
-
- return item->comment;
-}
-
-
int
gth_image_list_get_images (GthImageList *image_list)
{
@@ -4242,18 +4130,6 @@ gth_image_list_get_selection (GthImageList *image_list)
void
-gth_image_list_set_selection_mode (GthImageList *image_list,
- GtkSelectionMode mode)
-{
- g_return_if_fail (image_list != NULL);
-
- image_list->priv->selection_mode = mode;
- image_list->priv->last_selected_pos = -1;
- image_list->priv->last_selected_item = NULL;
-}
-
-
-void
gth_image_list_set_image_width (GthImageList *image_list,
int width)
{
@@ -4273,29 +4149,6 @@ gth_image_list_set_image_width (GthImageList *image_list,
}
-void
-gth_image_list_set_image_data (GthImageList *image_list,
- int pos,
- gpointer data)
-{
- GthImageListItem *item;
-
- g_return_if_fail (GTH_IS_IMAGE_LIST (image_list));
- g_return_if_fail ((pos >= 0) && (pos < image_list->priv->n_images));
-
- item = g_list_nth (image_list->priv->image_list, pos)->data;
- g_return_if_fail (item != NULL);
-
- if (item->data != NULL) {
- g_boxed_free (item->data_type, item->data);
- item->data = NULL;
- }
-
- if (data != NULL)
- item->data = g_boxed_copy (item->data_type, data);
-}
-
-
int
gth_image_list_find_image_from_data (GthImageList *image_list,
gpointer data)
@@ -4353,14 +4206,6 @@ gth_image_list_set_view_mode (GthImageList *image_list,
}
-int
-gth_image_list_get_view_mode (GthImageList *image_list)
-{
- g_return_val_if_fail (GTH_IS_IMAGE_LIST (image_list), 0);
- return image_list->priv->view_mode;
-}
-
-
void
gth_image_list_moveto (GthImageList *image_list,
int pos,
@@ -4559,17 +4404,6 @@ gth_image_list_unsorted (GthImageList *image_list)
void
-gth_image_list_image_activated (GthImageList *image_list,
- int pos)
-{
- g_return_if_fail (GTH_IS_IMAGE_LIST (image_list));
- g_return_if_fail ((pos >= 0) && (pos < image_list->priv->n_images));
-
- g_signal_emit (image_list, image_list_signals[ITEM_ACTIVATED], 0, pos);
-}
-
-
-void
gth_image_list_set_cursor (GthImageList *image_list,
int pos)
{
@@ -4775,10 +4609,3 @@ gth_image_list_set_enable_search (GthImageList *image_list,
}
-gboolean
-gth_image_list_get_enable_search (GthImageList *image_list)
-{
- g_return_val_if_fail (GTH_IS_IMAGE_LIST (image_list), FALSE);
- return image_list->priv->enable_search;
-}
-
diff --git a/libgthumb/gth-image-list.h b/libgthumb/gth-image-list.h
index 6872b3d..53bfb72 100644
--- a/libgthumb/gth-image-list.h
+++ b/libgthumb/gth-image-list.h
@@ -131,7 +131,6 @@ GtkWidget *gth_image_list_new (guint image_width,
GType data_type);
void gth_image_list_set_hadjustment (GthImageList *image_list,
GtkAdjustment *hadj);
-GtkAdjustment *gth_image_list_get_hadjustment (GthImageList *image_list);
void gth_image_list_set_vadjustment (GthImageList *image_list,
GtkAdjustment *vadj);
GtkAdjustment *gth_image_list_get_vadjustment (GthImageList *image_list);
@@ -145,17 +144,6 @@ gboolean gth_image_list_is_frozen (GthImageList *image_list);
/**/
-void gth_image_list_insert (GthImageList *image_list,
- int pos,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags);
-int gth_image_list_append (GthImageList *image_list,
- GdkPixbuf *pixbuf,
- const char *text,
- const char *comment,
- const char *tags);
int gth_image_list_append_with_data (GthImageList *image_list,
GdkPixbuf *pixbuf,
const char *text,
@@ -171,24 +159,18 @@ void gth_image_list_set_image_pixbuf (GthImageList *image_list,
void gth_image_list_set_image_text (GthImageList *image_list,
int pos,
const char *text);
-const char* gth_image_list_get_image_text (GthImageList *image_list,
- int pos);
void gth_image_list_set_image_comment (GthImageList *image_list,
int pos,
const char *comment);
void gth_image_list_set_image_tags (GthImageList *image_list,
int pos,
const char *tags);
-const char* gth_image_list_get_image_comment (GthImageList *image_list,
- int pos);
int gth_image_list_get_images (GthImageList *image_list);
GList * gth_image_list_get_list (GthImageList *image_list);
GList * gth_image_list_get_selection (GthImageList *image_list);
/* Managing the selection */
-void gth_image_list_set_selection_mode (GthImageList *image_list,
- GtkSelectionMode mode);
void gth_image_list_select_image (GthImageList *image_list,
int pos);
void gth_image_list_unselect_image (GthImageList *image_list,
@@ -197,8 +179,6 @@ void gth_image_list_select_all (GthImageList *gimage_lis
void gth_image_list_unselect_all (GthImageList *image_list);
gboolean gth_image_list_pos_is_selected (GthImageList *image_list,
int pos);
-int gth_image_list_get_first_selected (GthImageList *image_list);
-int gth_image_list_get_last_selected (GthImageList *image_list);
int gth_image_list_get_n_selected (GthImageList *image_list);
/* Setting spacing values */
@@ -208,9 +188,6 @@ void gth_image_list_set_image_width (GthImageList *image_list
/* Attaching information to the items */
-void gth_image_list_set_image_data (GthImageList *image_list,
- int pos,
- gpointer data);
int gth_image_list_find_image_from_data (GthImageList *image_list,
gpointer data);
gpointer gth_image_list_get_image_data (GthImageList *image_list,
@@ -222,7 +199,6 @@ void gth_image_list_enable_thumbs (GthImageList *image_list,
gboolean enable_thumbs);
void gth_image_list_set_view_mode (GthImageList *image_list,
int mode);
-int gth_image_list_get_view_mode (GthImageList *image_list);
void gth_image_list_moveto (GthImageList *image_list,
int pos,
double yalign);
@@ -244,8 +220,6 @@ void gth_image_list_unsorted (GthImageList *image_list);
/* Misc */
-void gth_image_list_image_activated (GthImageList *image_list,
- int pos);
void gth_image_list_set_cursor (GthImageList *image_list,
int pos);
int gth_image_list_get_cursor (GthImageList *image_list);
@@ -270,7 +244,6 @@ gboolean gth_image_list_get_reorderable (GthImageList *image_list);
void gth_image_list_set_enable_search (GthImageList *image_list,
gboolean enable_search);
-gboolean gth_image_list_get_enable_search (GthImageList *image_list);
G_END_DECLS
diff --git a/libgthumb/gthumb-histogram.c b/libgthumb/gthumb-histogram.c
index fa10549..5b3bf4f 100644
--- a/libgthumb/gthumb-histogram.c
+++ b/libgthumb/gthumb-histogram.c
@@ -81,7 +81,7 @@ gthumb_histogram_calculate (GthumbHistogram *histogram,
{
int **values = histogram->values;
int *values_max = histogram->values_max;
- int width, height, has_alpha, n_channels;
+ int width, height, n_channels;
int rowstride;
guchar *line, *pixel;
int i, j, max;
@@ -94,7 +94,6 @@ gthumb_histogram_calculate (GthumbHistogram *histogram,
return;
}
- has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
n_channels = gdk_pixbuf_get_n_channels (pixbuf);
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
line = gdk_pixbuf_get_pixels (pixbuf);
@@ -168,20 +167,6 @@ gthumb_histogram_get_value (GthumbHistogram *histogram,
double
-gthumb_histogram_get_channel (GthumbHistogram *histogram,
- int channel,
- int bin)
-{
- g_return_val_if_fail (histogram != NULL, 0.0);
-
- if (histogram->n_channels > 3)
- return gthumb_histogram_get_value (histogram, channel + 1, bin);
- else
- return gthumb_histogram_get_value (histogram, channel , bin);
-}
-
-
-double
gthumb_histogram_get_max (GthumbHistogram *histogram,
int channel)
{
diff --git a/libgthumb/gthumb-histogram.h b/libgthumb/gthumb-histogram.h
index 24604b0..b02ff55 100644
--- a/libgthumb/gthumb-histogram.h
+++ b/libgthumb/gthumb-histogram.h
@@ -50,10 +50,6 @@ double gthumb_histogram_get_value (GthumbHistogram *histogr
int channel,
int bin);
-double gthumb_histogram_get_channel (GthumbHistogram *histogram,
- int channel,
- int bin);
-
double gthumb_histogram_get_max (GthumbHistogram *histogram,
int channel);
diff --git a/libgthumb/gthumb-info-bar.c b/libgthumb/gthumb-info-bar.c
index f31ba2d..5374294 100644
--- a/libgthumb/gthumb-info-bar.c
+++ b/libgthumb/gthumb-info-bar.c
@@ -131,15 +131,6 @@ gthumb_info_bar_init (GThumbInfoBar *info_bar)
}
-void
-gthumb_info_bar_add_button (GThumbInfoBar *info_bar,
- GtkWidget *button,
- int padding)
-{
- gtk_box_pack_end (GTK_BOX (info_bar->priv->hbox), button, FALSE, FALSE, padding);
-}
-
-
GType
gthumb_info_bar_get_type (void)
{
diff --git a/libgthumb/gthumb-info-bar.h b/libgthumb/gthumb-info-bar.h
index a3d0bc8..1b7a934 100644
--- a/libgthumb/gthumb-info-bar.h
+++ b/libgthumb/gthumb-info-bar.h
@@ -60,8 +60,4 @@ void gthumb_info_bar_set_text (GThumbInfoBar *info_bar,
const char *text,
const char *tooltip);
-void gthumb_info_bar_add_button (GThumbInfoBar *info_bar,
- GtkWidget *button,
- int padding);
-
#endif /* GTHUMB_INFO_BAR_H */
diff --git a/libgthumb/image-loader.c b/libgthumb/image-loader.c
index 552420e..70ec7e6 100644
--- a/libgthumb/image-loader.c
+++ b/libgthumb/image-loader.c
@@ -471,57 +471,6 @@ image_loader_sync_pixbuf (ImageLoader *il)
static void
-image_loader_sync_pixbuf_from_loader (ImageLoader *il,
- GdkPixbufLoader *pb_loader)
-{
- GdkPixbuf *pixbuf;
- ImageLoaderPrivateData *priv;
-
- g_return_if_fail (il != NULL);
-
- priv = il->priv;
-
- g_mutex_lock (priv->data_mutex);
-
- if (priv->as_animation) {
- if (priv->animation != NULL)
- g_object_unref (priv->animation);
- priv->animation = gdk_pixbuf_loader_get_animation (pb_loader);
-
- if ((priv->animation != NULL)
- && ! gdk_pixbuf_animation_is_static_image (priv->animation)) {
- g_object_ref (G_OBJECT (priv->animation));
- g_mutex_unlock (priv->data_mutex);
- return;
- } else
- priv->animation = NULL;
- }
-
- pixbuf = gdk_pixbuf_loader_get_pixbuf (pb_loader);
- g_object_ref (pixbuf);
-
- if (priv->pixbuf == pixbuf) {
- g_object_unref (priv->pixbuf);
- g_mutex_unlock (priv->data_mutex);
- return;
- }
-
- if (priv->pixbuf != NULL) {
- g_object_unref (priv->pixbuf);
- priv->pixbuf = NULL;
- }
- if (pixbuf != NULL) {
- g_object_ref (pixbuf);
- priv->pixbuf = pixbuf;
- /*priv->pixbuf = gdk_pixbuf_copy (pixbuf);*/
- }
- g_object_unref (pixbuf);
-
- g_mutex_unlock (priv->data_mutex);
-}
-
-
-static void
image_loader_interrupted (ImageLoader *il)
{
ImageLoaderPrivateData *priv = il->priv;
@@ -824,25 +773,6 @@ image_loader_stop (ImageLoader *il,
}
-void
-image_loader_stop_with_error (ImageLoader *il,
- DoneFunc done_func,
- gpointer done_func_data)
-{
- ImageLoaderPrivateData *priv;
-
- g_return_if_fail (il != NULL);
-
- priv = il->priv;
-
- g_mutex_lock (priv->data_mutex);
- priv->error = TRUE;
- g_mutex_unlock (priv->data_mutex);
-
- image_loader_stop_common (il, done_func, done_func_data, TRUE, TRUE);
-}
-
-
GdkPixbuf *
image_loader_get_pixbuf (ImageLoader *il)
{
@@ -870,63 +800,6 @@ image_loader_get_animation (ImageLoader *il)
}
-gint
-image_loader_get_is_done (ImageLoader *il)
-{
- ImageLoaderPrivateData *priv;
- gboolean is_done;
-
- g_return_val_if_fail (il != NULL, 0);
- priv = il->priv;
-
- g_mutex_lock (priv->data_mutex);
- is_done = priv->done && priv->loader_done;
- g_mutex_unlock (priv->data_mutex);
-
- return is_done;
-}
-
-
-char *
-image_loader_get_path (ImageLoader *il)
-{
- char *path;
-
- g_return_val_if_fail (il != NULL, NULL);
-
- g_mutex_lock (il->priv->data_mutex);
- if (il->priv->file == NULL) {
- g_mutex_unlock (il->priv->data_mutex);
- return NULL;
- }
- path = g_strdup (il->priv->file->utf8_path);
- g_mutex_unlock (il->priv->data_mutex);
-
- return path;
-}
-
-
-void
-image_loader_load_from_pixbuf_loader (ImageLoader *il,
- GdkPixbufLoader *pixbuf_loader)
-{
- gboolean error;
-
- g_return_if_fail (il != NULL);
-
- image_loader_sync_pixbuf_from_loader (il, pixbuf_loader);
-
- g_mutex_lock (il->priv->data_mutex);
- error = (il->priv->pixbuf == NULL) && (il->priv->animation == NULL);
- g_mutex_unlock (il->priv->data_mutex);
-
- if (error)
- g_signal_emit (G_OBJECT (il), image_loader_signals[IMAGE_ERROR], 0);
- else
- g_signal_emit (G_OBJECT (il), image_loader_signals[IMAGE_DONE], 0);
-}
-
-
void
image_loader_load_from_image_loader (ImageLoader *to,
ImageLoader *from)
diff --git a/libgthumb/image-loader.h b/libgthumb/image-loader.h
index aeaa50e..8fefaf6 100644
--- a/libgthumb/image-loader.h
+++ b/libgthumb/image-loader.h
@@ -71,21 +71,14 @@ FileData * image_loader_get_file (ImageLoader *il
void image_loader_set_path (ImageLoader *il,
const char *path,
const char *mime_type);
-gchar * image_loader_get_path (ImageLoader *il);
void image_loader_set_pixbuf (ImageLoader *il,
GdkPixbuf *pixbuf);
GdkPixbuf * image_loader_get_pixbuf (ImageLoader *il);
GdkPixbufAnimation * image_loader_get_animation (ImageLoader *il);
-gint image_loader_get_is_done (ImageLoader *il);
void image_loader_start (ImageLoader *il);
void image_loader_stop (ImageLoader *il,
DoneFunc done_func,
gpointer done_func_data);
-void image_loader_stop_with_error (ImageLoader *il,
- DoneFunc done_func,
- gpointer done_func_data);
-void image_loader_load_from_pixbuf_loader (ImageLoader *il,
- GdkPixbufLoader *pl);
void image_loader_load_from_image_loader (ImageLoader *to,
ImageLoader *from);
diff --git a/libgthumb/image-viewer-image.c b/libgthumb/image-viewer-image.c
index 48ba1a6..568e34d 100644
--- a/libgthumb/image-viewer-image.c
+++ b/libgthumb/image-viewer-image.c
@@ -432,27 +432,6 @@ image_viewer_image_new (ImageViewer* viewer,
}
-gint
-image_viewer_image_get_bps (ImageViewerImage* image)
-{
- ImageViewerImagePrivate *priv;
- GdkPixbuf *pixbuf;
-
- g_return_val_if_fail (image != NULL, 0);
-
- priv = IMAGE_VIEWER_IMAGE_GET_PRIVATE (image);
-
- if (priv->iter != NULL)
- pixbuf = gdk_pixbuf_animation_iter_get_pixbuf (priv->iter);
- else
- pixbuf = priv->static_pixbuf;
-
- g_return_val_if_fail (pixbuf != NULL, 0);
-
- return gdk_pixbuf_get_bits_per_sample (pixbuf);
-}
-
-
GthFit
image_viewer_image_get_fit_mode (ImageViewerImage *image)
{
@@ -734,23 +713,6 @@ image_viewer_image_set_scroll_offsets (ImageViewerImage* image,
void
-image_viewer_image_set_zoom_level (ImageViewerImage* image,
- gdouble zoom_level)
-{
- ImageViewerImagePrivate* priv;
-
- g_return_if_fail (image != NULL);
-
- priv = IMAGE_VIEWER_IMAGE_GET_PRIVATE (image);
-
- /* set_zoom doesn't reset fit, should be used by internal zoom-fit options. */
- priv->fit = GTH_FIT_NONE;
-
- set_zoom_centered (image, zoom_level);
-}
-
-
-void
image_viewer_image_start_animation (ImageViewerImage *image)
{
ImageViewerImagePrivate *priv;
diff --git a/libgthumb/image-viewer-image.h b/libgthumb/image-viewer-image.h
index 835526e..392d790 100644
--- a/libgthumb/image-viewer-image.h
+++ b/libgthumb/image-viewer-image.h
@@ -58,7 +58,6 @@ GType image_viewer_image_get_type (void);
ImageViewerImage* image_viewer_image_new (ImageViewer* viewer,
ImageLoader* loader);
-gint image_viewer_image_get_bps (ImageViewerImage *image);
GthFit image_viewer_image_get_fit_mode (ImageViewerImage *image);
gboolean image_viewer_image_get_has_alpha (ImageViewerImage *image);
gboolean image_viewer_image_get_is_animation (ImageViewerImage *image);
diff --git a/libgthumb/image-viewer.c b/libgthumb/image-viewer.c
index 2327d98..53b50c3 100644
--- a/libgthumb/image-viewer.c
+++ b/libgthumb/image-viewer.c
@@ -612,32 +612,6 @@ image_viewer_expose (GtkWidget *widget,
}
-void
-image_viewer_scroll_to (ImageViewer *viewer,
- int x_offset,
- int y_offset)
-{
- ImageViewerPrivate *priv;
- gdouble x, y;
-
- g_return_if_fail (viewer != NULL);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- g_return_if_fail (priv->image != NULL);
-
- if (priv->rendering)
- return;
-
- image_viewer_image_get_scroll_offsets (priv->image, &x, &y);
-
- /* Convert absolute offset to relative change */
- x = x_offset - x;
- y = y_offset - y;
-
- scroll_relative (viewer, x, y);
-}
-
static void
scroll_relative (ImageViewer *viewer,
gdouble delta_x,
@@ -1269,50 +1243,12 @@ image_viewer_load_image (ImageViewer *viewer,
}
-/* -- image_viewer_load_from_pixbuf_loader -- */
-
-
typedef struct {
ImageViewer *viewer;
gpointer data;
} ImageViewerLoadData;
-void
-load_from_pixbuf_loader__step2 (ImageViewerLoadData *ivl_data)
-{
- ImageViewerPrivate* priv = IMAGE_VIEWER_GET_PRIVATE (ivl_data->viewer);
- GdkPixbufLoader *pixbuf_loader = ivl_data->data;
-
- image_loader_load_from_pixbuf_loader (priv->loader, pixbuf_loader);
- g_object_unref (pixbuf_loader);
- g_free (ivl_data);
-}
-
-
-void
-image_viewer_load_from_pixbuf_loader (ImageViewer *viewer,
- GdkPixbufLoader *pixbuf_loader)
-{
- ImageViewerLoadData *ivl_data;
- ImageViewerPrivate *priv;
-
- g_return_if_fail (viewer != NULL);
- g_return_if_fail (pixbuf_loader != NULL);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- g_object_ref (pixbuf_loader);
-
- ivl_data = g_new (ImageViewerLoadData, 1);
- ivl_data->viewer = viewer;
- ivl_data->data = pixbuf_loader;
- image_loader_stop (priv->loader,
- (DoneFunc) load_from_pixbuf_loader__step2,
- ivl_data);
-}
-
-
/* -- image_viewer_load_from_image_loader -- */
@@ -1475,36 +1411,6 @@ image_viewer_get_image_height (ImageViewer *viewer)
}
-gint
-image_viewer_get_image_bps (ImageViewer *viewer)
-{
- ImageViewerPrivate *priv;
-
- g_return_val_if_fail (viewer != NULL, 0);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- if (priv->image == NULL) return 0;
-
- return image_viewer_image_get_bps (priv->image);
-}
-
-
-gboolean
-image_viewer_get_has_alpha (ImageViewer *viewer)
-{
- ImageViewerPrivate *priv;
-
- g_return_val_if_fail (viewer != NULL, 0);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- if (priv->image == NULL) return FALSE;
-
- return image_viewer_image_get_has_alpha (priv->image);
-}
-
-
void
image_viewer_start_animation (ImageViewer *viewer)
{
@@ -1735,19 +1641,6 @@ image_viewer_set_zoom_change (ImageViewer *viewer,
}
-GthZoomChange
-image_viewer_get_zoom_change (ImageViewer *viewer)
-{
- ImageViewerPrivate *priv;
-
- g_return_val_if_fail (viewer != NULL, -1);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- return priv->zoom_change;
-}
-
-
void
image_viewer_zoom_in (ImageViewer *viewer)
{
@@ -1881,15 +1774,6 @@ image_viewer_get_check_size (ImageViewer *viewer)
}
-void
-image_viewer_clicked (ImageViewer *viewer)
-{
- g_return_if_fail (viewer != NULL);
- g_return_if_fail (IS_IMAGE_VIEWER (viewer));
- g_signal_emit (G_OBJECT (viewer), image_viewer_signals[CLICKED], 0);
-}
-
-
/* set_scroll_adjustments handler for the image view */
static void
set_scroll_adjustments (GtkWidget *widget,
@@ -2001,92 +1885,6 @@ scroll_signal (GtkWidget *widget,
scroll_relative (viewer, xstep, ystep);
}
-void
-image_viewer_scroll_step_x (ImageViewer *viewer,
- gboolean increment)
-{
- ImageViewerPrivate *priv;
-
- g_return_if_fail (IS_IMAGE_VIEWER (viewer));
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- scroll_relative (viewer,
- (increment ? 1 : -1) * priv->hadj->step_increment,
- 0);
-}
-
-
-void
-image_viewer_scroll_step_y (ImageViewer *viewer,
- gboolean increment)
-{
- ImageViewerPrivate* priv;
-
- g_return_if_fail (IS_IMAGE_VIEWER (viewer));
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- scroll_relative (viewer,
- 0,
- (increment ? 1 : -1) * priv->vadj->step_increment);
-}
-
-
-void
-image_viewer_scroll_page_x (ImageViewer *viewer,
- gboolean increment)
-{
- ImageViewerPrivate *priv;
-
- g_return_if_fail (IS_IMAGE_VIEWER (viewer));
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- scroll_relative (viewer,
- (increment ? 1 : -1) * priv->hadj->page_increment,
- 0);
-}
-
-
-void
-image_viewer_scroll_page_y (ImageViewer *viewer,
- gboolean increment)
-{
- ImageViewerPrivate* priv;
-
- g_return_if_fail (IS_IMAGE_VIEWER (viewer));
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- scroll_relative (viewer,
- 0,
- (increment ? 1 : -1) * priv->vadj->page_increment);
-}
-
-
-void
-image_viewer_get_scroll_offset (ImageViewer *viewer,
- int *x,
- int *y)
-{
- ImageViewerPrivate* priv;
- gdouble xd, yd;
-
- *x = *y = 0;
-
- g_return_if_fail (IS_IMAGE_VIEWER (viewer));
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- g_return_if_fail (priv->image != NULL);
-
- image_viewer_image_get_scroll_offsets (priv->image, &xd, &yd);
-
- *x = (int) xd;
- *y = (int) yd;
-}
-
void
image_viewer_set_reset_scrollbars (ImageViewer *viewer,
@@ -2098,14 +1896,6 @@ image_viewer_set_reset_scrollbars (ImageViewer *viewer,
}
-gboolean
-image_viewer_get_reset_scrollbars (ImageViewer *viewer)
-{
- ImageViewerPrivate *priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
- return priv->reset_scrollbars;
-}
-
-
void
image_viewer_size (ImageViewer *viewer,
int width,
@@ -2148,19 +1938,6 @@ image_viewer_hide_cursor (ImageViewer *viewer)
}
-gboolean
-image_viewer_is_cursor_visible (ImageViewer *viewer)
-{
- ImageViewerPrivate* priv;
-
- g_return_val_if_fail (viewer != NULL, FALSE);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- return priv->cursor_visible;
-}
-
-
void
image_viewer_set_black_background (ImageViewer *viewer,
gboolean set_black)
@@ -2185,34 +1962,6 @@ image_viewer_set_black_background (ImageViewer *viewer,
}
-gboolean
-image_viewer_is_black_background (ImageViewer *viewer)
-{
- ImageViewerPrivate *priv;
-
- g_return_val_if_fail (viewer != NULL, FALSE);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
- return priv->black_bg;
-}
-
-
-void
-image_viewer_show_frame (ImageViewer *viewer)
-{
- ImageViewerPrivate *priv;
-
- g_return_if_fail (viewer != NULL);
-
- priv = IMAGE_VIEWER_GET_PRIVATE (viewer);
-
- priv->frame_visible = TRUE;
- priv->frame_border = FRAME_BORDER;
- priv->frame_border2 = FRAME_BORDER2;
- gtk_widget_queue_resize (GTK_WIDGET (viewer));
-}
-
-
void
image_viewer_hide_frame (ImageViewer *viewer)
{
diff --git a/libgthumb/image-viewer.h b/libgthumb/image-viewer.h
index 7ee4511..8a5a1f9 100644
--- a/libgthumb/image-viewer.h
+++ b/libgthumb/image-viewer.h
@@ -90,8 +90,6 @@ void image_viewer_load_image_from_uri (ImageViewer *viewer,
const char *path);
void image_viewer_load_image (ImageViewer *viewer,
FileData *file);
-void image_viewer_load_from_pixbuf_loader (ImageViewer *viewer,
- GdkPixbufLoader *loader);
void image_viewer_load_from_image_loader (ImageViewer *viewer,
ImageLoader *loader);
void image_viewer_set_pixbuf (ImageViewer *viewer,
@@ -105,8 +103,6 @@ void image_viewer_update_view (ImageViewer *viewer);
char* image_viewer_get_image_filename (ImageViewer *viewer);
int image_viewer_get_image_width (ImageViewer *viewer);
int image_viewer_get_image_height (ImageViewer *viewer);
-int image_viewer_get_image_bps (ImageViewer *viewer);
-gboolean image_viewer_get_has_alpha (ImageViewer *viewer);
GdkPixbuf * image_viewer_get_current_pixbuf (ImageViewer *viewer);
/* animation. */
@@ -128,7 +124,6 @@ void image_viewer_set_zoom_quality (ImageViewer *viewer,
GthZoomQuality image_viewer_get_zoom_quality (ImageViewer *viewer);
void image_viewer_set_zoom_change (ImageViewer *viewer,
GthZoomChange zoom_change);
-GthZoomChange image_viewer_get_zoom_change (ImageViewer *viewer);
void image_viewer_zoom_in (ImageViewer *viewer);
void image_viewer_zoom_out (ImageViewer *viewer);
void image_viewer_set_fit_mode (ImageViewer *viewer,
@@ -149,43 +144,24 @@ GthCheckSize image_viewer_get_check_size (ImageViewer *viewer);
/* misc. */
-void image_viewer_clicked (ImageViewer *viewer);
void image_viewer_size (ImageViewer *viewer,
int width,
int height);
void image_viewer_set_black_background (ImageViewer *viewer,
gboolean set_black);
-gboolean image_viewer_is_black_background (ImageViewer *viewer);
/* Scrolling. */
-void image_viewer_scroll_to (ImageViewer *viewer,
- int x_offset,
- int y_offset);
-void image_viewer_scroll_step_x (ImageViewer *viewer,
- gboolean increment);
-void image_viewer_scroll_step_y (ImageViewer *viewer,
- gboolean increment);
-void image_viewer_scroll_page_x (ImageViewer *viewer,
- gboolean increment);
-void image_viewer_scroll_page_y (ImageViewer *viewer,
- gboolean increment);
-void image_viewer_get_scroll_offset (ImageViewer *viewer,
- int *x,
- int *y);
void image_viewer_set_reset_scrollbars (ImageViewer *viewer,
gboolean reset);
-gboolean image_viewer_get_reset_scrollbars (ImageViewer *viewer);
/* Cursor. */
void image_viewer_show_cursor (ImageViewer *viewer);
void image_viewer_hide_cursor (ImageViewer *viewer);
-gboolean image_viewer_is_cursor_visible (ImageViewer *viewer);
/* Frame. */
-void image_viewer_show_frame (ImageViewer *viewer);
void image_viewer_hide_frame (ImageViewer *viewer);
gboolean image_viewer_is_frame_visible (ImageViewer *viewer);
diff --git a/libgthumb/pixbuf-utils.c b/libgthumb/pixbuf-utils.c
index 7985af6..6470482 100644
--- a/libgthumb/pixbuf-utils.c
+++ b/libgthumb/pixbuf-utils.c
@@ -139,19 +139,6 @@ _gdk_pixbuf_transform (GdkPixbuf* src,
void
-pixmap_from_xpm (const char **data,
- GdkPixmap **pixmap,
- GdkBitmap **mask)
-{
- GdkPixbuf *pixbuf;
-
- pixbuf = gdk_pixbuf_new_from_xpm_data (data);
- gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, 127);
- g_object_unref (pixbuf);
-}
-
-
-void
_gdk_pixbuf_vertical_gradient (GdkPixbuf *pixbuf,
guint32 color1,
guint32 color2)
diff --git a/libgthumb/pixbuf-utils.h b/libgthumb/pixbuf-utils.h
index edf1a85..8ba450e 100644
--- a/libgthumb/pixbuf-utils.h
+++ b/libgthumb/pixbuf-utils.h
@@ -29,9 +29,6 @@
#include "typedefs.h"
-void pixmap_from_xpm (const char **data,
- GdkPixmap **pixmap,
- GdkBitmap **mask);
void _gdk_pixbuf_vertical_gradient (GdkPixbuf *pixbuf,
guint32 color1,
guint32 color2);
diff --git a/libgthumb/print-callbacks.c b/libgthumb/print-callbacks.c
index 8fd621b..9985a4a 100644
--- a/libgthumb/print-callbacks.c
+++ b/libgthumb/print-callbacks.c
@@ -1140,7 +1140,6 @@ add_catalog_preview (PrintCatalogDialogData *data,
double lmargin, rmargin, tmargin, bmargin;
double max_w, max_h;
GnomeCanvasGroup *root;
- int layout_width;
double image_space_x = IMAGE_SPACE;
double image_space_y = IMAGE_SPACE;
int i, rows, cols, row, col, page = 0, idx;
@@ -1153,8 +1152,6 @@ add_catalog_preview (PrintCatalogDialogData *data,
bmargin = pci->paper_bmargin;
tmargin = pci->paper_tmargin;
- layout_width = (int) ((pci->paper_width - lmargin - rmargin) * CANVAS_ZOOM);
-
max_w = w - lmargin - rmargin;
max_h = h - bmargin - tmargin;
diff --git a/libgthumb/progress-dialog.c b/libgthumb/progress-dialog.c
index 36de462..3c01d66 100644
--- a/libgthumb/progress-dialog.c
+++ b/libgthumb/progress-dialog.c
@@ -141,14 +141,6 @@ progress_dialog_hide (ProgressDialog *pd)
void
-progress_dialog_set_parent (ProgressDialog *pd,
- GtkWindow *parent)
-{
- gtk_window_set_transient_for (GTK_WINDOW (pd->dialog), parent);
-}
-
-
-void
progress_dialog_set_progress (ProgressDialog *pd,
double fraction)
{
diff --git a/libgthumb/progress-dialog.h b/libgthumb/progress-dialog.h
index 638fed9..416998b 100644
--- a/libgthumb/progress-dialog.h
+++ b/libgthumb/progress-dialog.h
@@ -38,9 +38,6 @@ void progress_dialog_show (ProgressDialog *pd);
void progress_dialog_hide (ProgressDialog *pd);
-void progress_dialog_set_parent (ProgressDialog *pd,
- GtkWindow *parent);
-
void progress_dialog_set_progress (ProgressDialog *pd,
double fraction);
diff --git a/src/albumtheme-private.c b/src/albumtheme-private.c
index 66a7f2f..444b732 100644
--- a/src/albumtheme-private.c
+++ b/src/albumtheme-private.c
@@ -103,13 +103,6 @@ gth_mem_get (GthMem *mem)
}
-int
-gth_mem_get_top (GthMem *mem)
-{
- return mem->top;
-}
-
-
/* GthCell */
@@ -200,20 +193,6 @@ gth_expr_unref (GthExpr *e)
}
-void
-gth_expr_set_empty (GthExpr *e)
-{
- e->top = 0;
-}
-
-
-gboolean
-gth_expr_is_empty (GthExpr *e)
-{
- return (e->top == 0);
-}
-
-
void
gth_expr_push_expr (GthExpr *e, GthExpr *e2)
{
@@ -275,14 +254,6 @@ gth_expr_push_constant (GthExpr *e, int value)
}
-void
-gth_expr_pop (GthExpr *e)
-{
- if (! gth_expr_is_empty (e))
- e->top--;
-}
-
-
GthCell*
gth_expr_get_pos (GthExpr *e, int pos)
{
@@ -316,52 +287,6 @@ gth_expr_set_get_var_value_func (GthExpr *e,
}
-static char *op_name[] = {
- "ADD",
- "SUB",
- "MUL",
- "DIV",
- "NEG",
- "NOT",
- "AND",
- "OR",
- "CMP_EQ",
- "CMP_NE",
- "CMP_LT",
- "CMP_GT",
- "CMP_LE",
- "CMP_GE"
-};
-
-
-void
-gth_expr_print (GthExpr *e)
-{
- int i;
-
- for (i = 0; i < gth_expr_get_top (e); i++) {
- GthCell *cell = gth_expr_get_pos (e, i + 1);
-
- switch (cell->type) {
- case GTH_CELL_TYPE_VAR:
- printf ("VAR: %s (%d)\n",
- cell->value.var,
- e->get_var_value_func (cell->value.var,
- e->get_var_value_data));
- break;
-
- case GTH_CELL_TYPE_CONSTANT:
- printf ("NUM: %d\n", cell->value.constant);
- break;
-
- case GTH_CELL_TYPE_OP:
- printf ("OP: %s\n", op_name[cell->value.op]);
- break;
- }
- }
-}
-
-
int
gth_expr_eval (GthExpr *e)
{
@@ -498,21 +423,6 @@ gth_expr_eval (GthExpr *e)
GthVar *
-gth_var_new_constant (int value)
-{
- GthVar *var;
-
- var = g_new0 (GthVar, 1);
- var->name = NULL;
- var->type = GTH_VAR_EXPR;
- var->value.expr = gth_expr_new ();
- gth_expr_push_constant (var->value.expr, value);
-
- return var;
-}
-
-
-GthVar *
gth_var_new_expression (const char *name,
GthExpr *e)
{
@@ -529,24 +439,6 @@ gth_var_new_expression (const char *name,
}
-GthVar*
-gth_var_new_string (const char *name,
- const char *string)
-{
- GthVar *var;
-
- g_return_val_if_fail (name != NULL, NULL);
-
- var = g_new0 (GthVar, 1);
- var->type = GTH_VAR_STRING;
- var->name = g_strdup (name);
- if (string != NULL)
- var->value.string = g_strdup (string);
-
- return var;
-}
-
-
void
gth_var_free (GthVar *var)
{
diff --git a/src/albumtheme-private.h b/src/albumtheme-private.h
index 8dad66b..2034df4 100644
--- a/src/albumtheme-private.h
+++ b/src/albumtheme-private.h
@@ -52,8 +52,6 @@ int gth_mem_get_pos (GthMem *mem,
int gth_mem_get (GthMem *mem);
-int gth_mem_get_top (GthMem *mem);
-
/* GthCell */
typedef enum {
@@ -113,10 +111,6 @@ GthExpr* gth_expr_ref (GthExpr *e);
void gth_expr_unref (GthExpr *e);
-void gth_expr_set_empty (GthExpr *e);
-
-gboolean gth_expr_is_empty (GthExpr *e);
-
void gth_expr_push_expr (GthExpr *e, GthExpr *e2);
void gth_expr_push_op (GthExpr *e, GthOp op);
@@ -125,14 +119,10 @@ void gth_expr_push_var (GthExpr *e, const char *name);
void gth_expr_push_constant (GthExpr *e, int value);
-void gth_expr_pop (GthExpr *e);
-
GthCell* gth_expr_get_pos (GthExpr *e, int pos);
GthCell* gth_expr_get (GthExpr *e);
-int gth_expr_get_top (GthExpr *e);
-
void gth_expr_set_get_var_value_func (GthExpr *e,
GthGetVarValueFunc f,
gpointer data);
@@ -155,12 +145,8 @@ typedef struct {
} value;
} GthVar;
-GthVar* gth_var_new_constant (int value);
-
GthVar* gth_var_new_expression (const char *name, GthExpr *e);
-GthVar* gth_var_new_string (const char *name, const char *string);
-
void gth_var_free (GthVar *var);
/* GthCondition */
diff --git a/src/bookmark-list.c b/src/bookmark-list.c
index 605d0b9..05e917f 100644
--- a/src/bookmark-list.c
+++ b/src/bookmark-list.c
@@ -178,46 +178,6 @@ bookmark_list_set (BookmarkList *book_list,
gchar *
-bookmark_list_get_path_from_tree_path (BookmarkList *book_list,
- GtkTreePath *path)
-{
- GtkTreeIter iter;
- gchar *name;
-
- g_return_val_if_fail (book_list != NULL, NULL);
-
- if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (book_list->list_store),
- &iter,
- path))
- return NULL;
-
- gtk_tree_model_get (GTK_TREE_MODEL (book_list->list_store),
- &iter,
- BOOK_LIST_COLUMN_PATH, &name,
- -1);
- return name;
-}
-
-
-gchar *
-bookmark_list_get_path_from_row (BookmarkList *book_list,
- gint row)
-{
- GtkTreePath *path;
- char *result;
-
- g_return_val_if_fail (book_list != NULL, NULL);
-
- path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, row);
- result = bookmark_list_get_path_from_tree_path (book_list, path);
- gtk_tree_path_free (path);
-
- return result;
-}
-
-
-gchar *
bookmark_list_get_selected_path (BookmarkList *book_list)
{
GtkTreeSelection *selection;
diff --git a/src/bookmark-list.h b/src/bookmark-list.h
index 6a4e6e6..ceea6f6 100644
--- a/src/bookmark-list.h
+++ b/src/bookmark-list.h
@@ -42,12 +42,6 @@ void bookmark_list_free (BookmarkList *book_list);
void bookmark_list_set (BookmarkList *book_list,
GList *list);
-char * bookmark_list_get_path_from_tree_path (BookmarkList *book_list,
- GtkTreePath *path);
-
-char * bookmark_list_get_path_from_row (BookmarkList *book_list,
- int row);
-
char * bookmark_list_get_selected_path (BookmarkList *book_list);
void bookmark_list_select_item (BookmarkList *book_list,
diff --git a/src/catalog-list.c b/src/catalog-list.c
index a280491..bfe3ff3 100644
--- a/src/catalog-list.c
+++ b/src/catalog-list.c
@@ -375,22 +375,6 @@ catalog_list_get_selected_path (CatalogList *cat_list)
gboolean
-catalog_list_is_catalog (CatalogList *cat_list,
- GtkTreeIter *iter)
-{
- int type;
-
- g_return_val_if_fail (cat_list != NULL, FALSE);
-
- gtk_tree_model_get (GTK_TREE_MODEL (cat_list->list_store),
- iter,
- CAT_LIST_COLUMN_TYPE, &type,
- -1);
- return (type == CAT_LIST_TYPE_CATALOG);
-}
-
-
-gboolean
catalog_list_is_dir (CatalogList *cat_list,
GtkTreeIter *iter)
{
diff --git a/src/catalog-list.h b/src/catalog-list.h
index 54aef01..a881f9d 100644
--- a/src/catalog-list.h
+++ b/src/catalog-list.h
@@ -51,8 +51,6 @@ char * catalog_list_get_path_from_row (CatalogList *cat_list,
gboolean catalog_list_get_selected_iter (CatalogList *cat_list,
GtkTreeIter *iter);
char * catalog_list_get_selected_path (CatalogList *cat_list);
-gboolean catalog_list_is_catalog (CatalogList *cat_list,
- GtkTreeIter *iter);
gboolean catalog_list_is_dir (CatalogList *cat_list,
GtkTreeIter *iter);
gboolean catalog_list_is_search (CatalogList *cat_list,
diff --git a/src/catalog-web-exporter.c b/src/catalog-web-exporter.c
index 028d274..ffbc90f 100644
--- a/src/catalog-web-exporter.c
+++ b/src/catalog-web-exporter.c
@@ -688,13 +688,6 @@ catalog_web_exporter_set_image_caption (CatalogWebExporter *ce,
}
-guint16
-catalog_web_exporter_get_image_caption (CatalogWebExporter *ce)
-{
- return ce->image_caption_mask;
-}
-
-
void
catalog_web_exporter_set_index_caption (CatalogWebExporter *ce,
GthCaptionFields caption)
@@ -704,13 +697,6 @@ catalog_web_exporter_set_index_caption (CatalogWebExporter *ce,
}
-guint16
-catalog_web_exporter_get_index_caption (CatalogWebExporter *ce)
-{
- return ce->index_caption_mask;
-}
-
-
static int
comp_func_name (gconstpointer a, gconstpointer b)
{
diff --git a/src/catalog-web-exporter.h b/src/catalog-web-exporter.h
index c0d303a..54c00b9 100644
--- a/src/catalog-web-exporter.h
+++ b/src/catalog-web-exporter.h
@@ -177,10 +177,8 @@ void catalog_web_exporter_set_single_index (CatalogWebExporter *ce,
gboolean copy);
void catalog_web_exporter_set_image_caption (CatalogWebExporter *ce,
GthCaptionFields caption);
-guint16 catalog_web_exporter_get_image_caption (CatalogWebExporter *ce);
void catalog_web_exporter_set_index_caption (CatalogWebExporter *ce,
GthCaptionFields caption);
-guint16 catalog_web_exporter_get_index_caption (CatalogWebExporter *ce);
void catalog_web_exporter_export (CatalogWebExporter *ce);
void catalog_web_exporter_interrupt (CatalogWebExporter *ce);
diff --git a/src/dlg-redeye-removal.c b/src/dlg-redeye-removal.c
index 830e6ff..2f766b9 100644
--- a/src/dlg-redeye-removal.c
+++ b/src/dlg-redeye-removal.c
@@ -142,7 +142,7 @@ image_selector_motion_notify_cb (GthImageSelector *selector,
}
-static int
+static void
find_region (int row,
int col,
int *rtop,
@@ -292,8 +292,6 @@ find_region (int row,
g_free (rows);
g_free (cols);
-
- return total;
}
@@ -311,9 +309,8 @@ fix_redeye (GdkPixbuf *pixbuf,
int channels;
guchar *pixels;
int search, i, j, ii, jj;
- int ad_red, ad_blue, ad_green;
+ int ad_blue, ad_green;
int rtop, rbot, rleft, rright; /* edges of region */
- int num_pix;
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
@@ -334,7 +331,7 @@ fix_redeye (GdkPixbuf *pixbuf,
isred[j + i * width] = 2;
- num_pix = find_region (i, j, &rtop, &rbot, &rleft, &rright, isred, width, height);
+ find_region (i, j, &rtop, &rbot, &rleft, &rright, isred, width, height);
/* Fix the region. */
for (ii = rtop; ii <= rbot; ii++)
@@ -343,7 +340,6 @@ fix_redeye (GdkPixbuf *pixbuf,
int ofs;
ofs = channels*jj + ii*rowstride;
- ad_red = pixels[ofs] * RED_FACTOR;
ad_green = pixels[ofs + 1] * GREEN_FACTOR;
ad_blue = pixels[ofs + 2] * BLUE_FACTOR;
diff --git a/src/dlg-reset-exif.c b/src/dlg-reset-exif.c
index 1cdd27c..df067bf 100644
--- a/src/dlg-reset-exif.c
+++ b/src/dlg-reset-exif.c
@@ -269,25 +269,3 @@ dlg_reset_exif (GthWindow *window)
gtk_widget_show_all (data->dialog);
}
-
-void
-dlg_apply_reset_exif (GthWindow *window)
-{
- DialogData *data;
- GList *list;
-
- list = gth_window_get_file_list_selection_as_fd (window);
- if (list == NULL) {
- g_warning ("No file selected.");
- return;
- }
-
- gth_monitor_pause ();
-
- data = g_new0 (DialogData, 1);
- data->window = window;
- data->file_list = list;
- data->current_image = list;
-
- apply_transformation_to_all (data);
-}
diff --git a/src/dlg-reset-exif.h b/src/dlg-reset-exif.h
index ce8f318..dfef778 100644
--- a/src/dlg-reset-exif.h
+++ b/src/dlg-reset-exif.h
@@ -27,6 +27,5 @@
void dlg_reset_exif (GthWindow *window);
-void dlg_apply_reset_exif (GthWindow *window);
#endif /* DLG_RESET_EXIF_H */
diff --git a/src/gth-batch-op.c b/src/gth-batch-op.c
index 6f1c03c..1a9a7ff 100644
--- a/src/gth-batch-op.c
+++ b/src/gth-batch-op.c
@@ -740,11 +740,3 @@ gth_batch_op_start (GthBatchOp *bop,
load_current_image (bop);
}
-
-void
-gth_batch_op_stop (GthBatchOp *bop)
-{
- g_return_if_fail (GTH_IS_BATCH_OP (bop));
- PD(bop)->stop_operation = TRUE;
-}
-
diff --git a/src/gth-batch-op.h b/src/gth-batch-op.h
index 55ab1cd..01b2a27 100644
--- a/src/gth-batch-op.h
+++ b/src/gth-batch-op.h
@@ -66,6 +66,5 @@ void gth_batch_op_start (GthBatchOp *batch_op,
GthOverwriteMode overwrite_mode,
gboolean remove_original,
GtkWindow *window);
-void gth_batch_op_stop (GthBatchOp *batch_op);
#endif /* GTH_BATCH_OP_H */
diff --git a/src/gth-dir-list.c b/src/gth-dir-list.c
index 5f9512f..65ef47f 100644
--- a/src/gth-dir-list.c
+++ b/src/gth-dir-list.c
@@ -767,34 +767,6 @@ gth_dir_list_get_path_from_iter (GthDirList *dir_list,
}
-int
-gth_dir_list_get_row_from_path (GthDirList *dir_list,
- const char *path)
-{
- GList *scan;
- const char *name;
- char *parent;
- int pos;
-
- parent = remove_level_from_path (path);
- if (! same_uri (dir_list->path, parent)) {
- g_free (parent);
- return -1;
- }
- g_free (parent);
-
- name = file_name_from_path (path);
-
- for (pos = 0, scan = dir_list->list; scan; scan = scan->next) {
- if (same_uri (name, (char*) scan->data))
- return pos;
- pos++;
- }
-
- return -1;
-}
-
-
char *
gth_dir_list_get_path_from_tree_path (GthDirList *dir_list,
GtkTreePath *path)
diff --git a/src/gth-dir-list.h b/src/gth-dir-list.h
index 68ae01a..1a800fd 100644
--- a/src/gth-dir-list.h
+++ b/src/gth-dir-list.h
@@ -89,8 +89,6 @@ char * gth_dir_list_get_path_from_iter (GthDirList *dir_list,
GtkTreeIter *iter);
char * gth_dir_list_get_path_from_row (GthDirList *dir_list,
int row);
-int gth_dir_list_get_row_from_path (GthDirList *dir_list,
- const char *path);
gboolean gth_dir_list_get_selected_iter (GthDirList *dir_list,
GtkTreeIter *iter);
char * gth_dir_list_get_selected_path (GthDirList *dir_list);
diff --git a/src/gth-fullscreen.c b/src/gth-fullscreen.c
index 3cf2b68..70ffae2 100644
--- a/src/gth-fullscreen.c
+++ b/src/gth-fullscreen.c
@@ -645,7 +645,6 @@ render_background (GdkDrawable *drawable,
{
GdkPixbuf *pixbuf;
guchar *data;
- int rowstride;
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
bounds->width, bounds->height);
@@ -654,7 +653,6 @@ render_background (GdkDrawable *drawable,
/**/
data = gdk_pixbuf_get_pixels (pixbuf);
- rowstride = gdk_pixbuf_get_rowstride (pixbuf);
/* first corner */
make_transparent (data, 0, 0x00);
diff --git a/src/gth-image-selector.c b/src/gth-image-selector.c
index a616a1f..9530fbc 100644
--- a/src/gth-image-selector.c
+++ b/src/gth-image-selector.c
@@ -2143,14 +2143,6 @@ gth_image_selector_set_selection_height (GthImageSelector *selector,
void
-gth_image_selector_set_selection (GthImageSelector *selector,
- GdkRectangle selection)
-{
- set_selection (selector, selection, FALSE);
-}
-
-
-void
gth_image_selector_get_selection (GthImageSelector *selector,
GdkRectangle *selection)
{
@@ -2200,20 +2192,6 @@ gth_image_selector_set_ratio (GthImageSelector *selector,
}
-double
-gth_image_selector_get_ratio (GthImageSelector *selector)
-{
- return selector->priv->ratio;
-}
-
-
-gboolean
-gth_image_selector_get_use_ratio (GthImageSelector *selector)
-{
- return selector->priv->use_ratio;
-}
-
-
void
gth_image_selector_set_mask_visible (GthImageSelector *selector,
gboolean visible)
diff --git a/src/gth-image-selector.h b/src/gth-image-selector.h
index 0bbc29f..14adfd1 100644
--- a/src/gth-image-selector.h
+++ b/src/gth-image-selector.h
@@ -82,16 +82,12 @@ void gth_image_selector_set_selection_width (GthImageSelector *selector,
int width);
void gth_image_selector_set_selection_height (GthImageSelector *selector,
int height);
-void gth_image_selector_set_selection (GthImageSelector *selector,
- GdkRectangle selection);
void gth_image_selector_get_selection (GthImageSelector *selector,
GdkRectangle *selection);
void gth_image_selector_set_ratio (GthImageSelector *selector,
gboolean use_ratio,
double ratio,
gboolean swap_x_and_y_to_start);
-double gth_image_selector_get_ratio (GthImageSelector *selector);
-gboolean gth_image_selector_get_use_ratio (GthImageSelector *selector);
void gth_image_selector_set_mask_visible (GthImageSelector *selector,
gboolean visible);
gboolean gth_image_selector_get_mask_visible (GthImageSelector *selector);
diff --git a/src/gth-window-actions-callbacks.c b/src/gth-window-actions-callbacks.c
index cf5e722..bced265 100644
--- a/src/gth-window-actions-callbacks.c
+++ b/src/gth-window-actions-callbacks.c
@@ -753,7 +753,6 @@ set_wallpaper_from_window (GthWindow *window,
ImageViewer *image_viewer;
GdkPixbuf *pixbuf;
char *wallpaper_filename = NULL;
- char *local_file;
GError *error = NULL;
FileData *fd;
@@ -786,7 +785,6 @@ set_wallpaper_from_window (GthWindow *window,
file_data_unref (fd);
g_object_unref (pixbuf);
- g_free (local_file);
}
set_wallpaper (window, image_path, align);
diff --git a/src/gth-window.c b/src/gth-window.c
index c0b6924..a65dfd3 100644
--- a/src/gth-window.c
+++ b/src/gth-window.c
@@ -661,13 +661,6 @@ gth_window_set_slideshow (GthWindow *window,
}
-gboolean
-gth_window_get_slideshow (GthWindow *window)
-{
- return window->priv->slideshow;
-}
-
-
int
gth_window_get_n_windows (void)
{
diff --git a/src/gth-window.h b/src/gth-window.h
index b021e7e..74b7c09 100644
--- a/src/gth-window.h
+++ b/src/gth-window.h
@@ -137,7 +137,6 @@ void gth_window_set_fullscreen (GthWindow *window,
gboolean gth_window_get_fullscreen (GthWindow *window);
void gth_window_set_slideshow (GthWindow *window,
gboolean value);
-gboolean gth_window_get_slideshow (GthWindow *window);
/**/
diff --git a/src/gthumb-preloader.c b/src/gthumb-preloader.c
index f027d83..61f6e83 100644
--- a/src/gthumb-preloader.c
+++ b/src/gthumb-preloader.c
@@ -74,7 +74,6 @@ loader_error_cb (ImageLoader *il,
PreLoader *ploader)
{
GThumbPreloader *gploader = ploader->gploader;
- int timeout = NEXT_LOAD_SMALL_TIMEOUT;
ploader->loaded = FALSE;
ploader->error = TRUE;
@@ -83,7 +82,6 @@ loader_error_cb (ImageLoader *il,
g_signal_emit (G_OBJECT (gploader),
gthumb_preloader_signals[REQUESTED_ERROR], 0);
debug (DEBUG_INFO, "[requested] error");
- timeout = NEXT_LOAD_BIG_TIMEOUT;
}
gploader->load_id = g_idle_add (load_next, gploader);
@@ -451,46 +449,6 @@ gthumb_preloader_load (GThumbPreloader *gploader,
}
-void
-gthumb_preloader_start (GThumbPreloader *gploader,
- const char *requested,
- const char *next1,
- const char *prev1)
-{
- FileData *f_requested = NULL;
- FileData *f_next1 = NULL;
- FileData *f_prev1 = NULL;
- gboolean fast_mime_type;
-
- g_return_if_fail (requested != NULL);
-
- if (! is_local_file (next1))
- next1 = NULL;
- if (! is_local_file (prev1))
- prev1 = NULL;
-
- fast_mime_type = eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE);
-
- f_requested = file_data_new (requested);
- file_data_update_all (f_requested, fast_mime_type);
- if (next1 != NULL) {
- f_next1 = file_data_new (next1);
- file_data_update (f_next1);
- file_data_update_mime_type (f_next1, fast_mime_type);
- }
- if (prev1 != NULL) {
- f_prev1 = file_data_new (prev1);
- file_data_update_all (f_prev1, fast_mime_type);
- }
-
- gthumb_preloader_load (gploader, f_requested, f_next1, f_prev1);
-
- file_data_unref (f_requested);
- file_data_unref (f_next1);
- file_data_unref (f_prev1);
-}
-
-
ImageLoader *
gthumb_preloader_get_loader (GThumbPreloader *gploader,
const char *path)
diff --git a/src/gthumb-preloader.h b/src/gthumb-preloader.h
index 5cdc14d..a860ec7 100644
--- a/src/gthumb-preloader.h
+++ b/src/gthumb-preloader.h
@@ -96,10 +96,6 @@ GThumbPreloader *gthumb_preloader_new (void);
/* images get loaded in the following order : requested, next1, prev1.
*/
-void gthumb_preloader_start (GThumbPreloader *gploader,
- const char *requested,
- const char *next1,
- const char *prev1);
void gthumb_preloader_load (GThumbPreloader *gploader,
FileData *requested,
FileData *next1,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
