Updating branch refs/heads/master to 96754ea5b1976bc181af9521f79b235f36f6fb6e (commit) from 750e20e65bdd0cdaade74bc94f07b9b260f9008a (commit)
commit 96754ea5b1976bc181af9521f79b235f36f6fb6e Author: Stephan Arts <step...@xfce.org> Date: Sat Mar 3 11:38:16 2012 +0100 Resolve compile-errors src/file.c | 11 +++++++++++ src/icon_bar.c | 14 ++++---------- src/image_list.c | 6 ------ src/image_viewer.c | 1 - src/main_window.c | 5 ++--- src/util.h | 26 +++++++++----------------- 6 files changed, 26 insertions(+), 37 deletions(-) diff --git a/src/file.c b/src/file.c index 4cc68ad..e840c53 100644 --- a/src/file.c +++ b/src/file.c @@ -30,6 +30,17 @@ #include "file.h" #include "thumbnailer.h" +static uint rstto_thumbnail_size[] = +{ + THUMBNAIL_SIZE_VERY_SMALL_SIZE, + THUMBNAIL_SIZE_SMALLER_SIZE, + THUMBNAIL_SIZE_SMALL_SIZE, + THUMBNAIL_SIZE_NORMAL_SIZE, + THUMBNAIL_SIZE_LARGE_SIZE, + THUMBNAIL_SIZE_LARGER_SIZE, + THUMBNAIL_SIZE_VERY_LARGE_SIZE +}; + static void rstto_file_init (GObject *); static void diff --git a/src/icon_bar.c b/src/icon_bar.c index ae5a2c9..e69572d 100644 --- a/src/icon_bar.c +++ b/src/icon_bar.c @@ -181,11 +181,6 @@ rstto_icon_bar_calculate_item_size ( RsttoIconBar *icon_bar, RsttoIconBarItem *item); -static GdkPixbuf * -rstto_icon_bar_get_item_icon ( - RsttoIconBar *icon_bar, - RsttoIconBarItem *item); - static void rstto_icon_bar_adjustment_changed ( RsttoIconBar *icon_bar, @@ -779,7 +774,6 @@ rstto_icon_bar_size_allocate ( RsttoIconBar *icon_bar = RSTTO_ICON_BAR (widget); gdouble value = 0.0; gdouble page_size = 0.0; - gdouble scale = 0.0; widget->allocation = *allocation; @@ -971,7 +965,6 @@ rstto_icon_bar_motion ( { RsttoIconBarItem *item; RsttoIconBar *icon_bar = RSTTO_ICON_BAR (widget); - GtkTreePath *path; GtkTreeIter iter; RsttoFile *file; @@ -1235,14 +1228,12 @@ rstto_icon_bar_paint_item ( const GdkPixbuf *pixbuf = NULL; GdkColor *border_color; GdkColor *fill_color; - GdkColor *text_color; GdkGC *gc; gint focus_width; gint focus_pad; gint x, y; gint px, py; gint pixbuf_height, pixbuf_width; - const gchar *thumbnail_path; RsttoFile *file; GtkTreeIter iter; @@ -1387,7 +1378,6 @@ rstto_icon_bar_calculate_item_size ( RsttoIconBar *icon_bar, RsttoIconBarItem *item) { - GdkPixbuf *pixbuf; gint focus_width; gint focus_pad; gint int_pad; @@ -1424,6 +1414,8 @@ rstto_icon_bar_calculate_item_size ( case THUMBNAIL_SIZE_VERY_LARGE: item->width = (2 * (int_pad + focus_width + focus_pad)) + THUMBNAIL_SIZE_VERY_LARGE_SIZE; break; + default: + break; } item->height = item->width; @@ -2222,6 +2214,8 @@ rstto_icon_bar_update_missing_icon (RsttoIconBar *icon_bar) 0, NULL); break; + default: + break; } } diff --git a/src/image_list.c b/src/image_list.c index 021fef3..63d2b8a 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -194,11 +194,6 @@ enum RSTTO_IMAGE_LIST_ITER_SIGNAL_COUNT }; -/* Missing image thumbnail, should be re-generated every time - * the thumbnail-size changed. - */ -static GdkPixbuf *thumbnail_missing = NULL; - struct _RsttoImageListIterPriv { RsttoImageList *image_list; @@ -1436,7 +1431,6 @@ image_list_model_get_value ( gint column, GValue *value ) { - RsttoImageList *image_list = RSTTO_IMAGE_LIST (tree_model); RsttoFile *file = RSTTO_FILE(iter->user_data); switch (column) diff --git a/src/image_viewer.c b/src/image_viewer.c index dfc1166..86bbfff 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -1917,7 +1917,6 @@ cb_rstto_image_loader_closed (GdkPixbufLoader *loader, RsttoImageViewerTransacti { RsttoImageViewer *viewer = transaction->viewer; GtkWidget *widget = GTK_WIDGET(viewer); - GtkWidget *vbox, *do_not_show_checkbox; if (viewer->priv->transaction == transaction) { diff --git a/src/main_window.c b/src/main_window.c index 936f3cd..e42e2d6 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -470,6 +470,7 @@ rstto_main_window_init (RsttoMainWindow *window) GtkRecentFilter *recent_filter; guint window_width, window_height; gchar *desktop_type = NULL; + GtkWidget *info_bar_content_area; GClosure *toggle_fullscreen_closure = g_cclosure_new ((GCallback)cb_rstto_main_window_fullscreen, window, NULL); GClosure *leave_fullscreen_closure = g_cclosure_new_swap ((GCallback)gtk_window_unfullscreen, window, NULL); @@ -622,7 +623,7 @@ rstto_main_window_init (RsttoMainWindow *window) window->priv->warning = gtk_info_bar_new(); window->priv->warning_label = gtk_label_new(NULL); - GtkWidget *info_bar_content_area = gtk_info_bar_get_content_area ( + info_bar_content_area = gtk_info_bar_get_content_area ( GTK_INFO_BAR (window->priv->warning)); gtk_container_add ( GTK_CONTAINER (info_bar_content_area), @@ -913,8 +914,6 @@ rstto_main_window_class_init(RsttoMainWindowClass *window_class) static void rstto_main_window_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - RsttoMainWindow *window = RSTTO_MAIN_WINDOW(widget); - GTK_WIDGET_CLASS (parent_class)->size_allocate(widget, allocation); } diff --git a/src/util.h b/src/util.h index e815e26..64e405e 100644 --- a/src/util.h +++ b/src/util.h @@ -47,6 +47,15 @@ typedef enum { SORT_TYPE_COUNT, } RsttoSortType; + +#define THUMBNAIL_SIZE_VERY_SMALL_SIZE 24 +#define THUMBNAIL_SIZE_SMALLER_SIZE 32 +#define THUMBNAIL_SIZE_SMALL_SIZE 48 +#define THUMBNAIL_SIZE_NORMAL_SIZE 64 +#define THUMBNAIL_SIZE_LARGE_SIZE 96 +#define THUMBNAIL_SIZE_LARGER_SIZE 128 +#define THUMBNAIL_SIZE_VERY_LARGE_SIZE 256 + typedef enum { THUMBNAIL_SIZE_VERY_SMALL = 0, THUMBNAIL_SIZE_SMALLER, @@ -58,21 +67,4 @@ typedef enum { THUMBNAIL_SIZE_COUNT, } RsttoThumbnailSize; -static guint rstto_thumbnail_size[] = { - 24, - 32, - 48, - 64, - 96, - 128, - 256}; - -#define THUMBNAIL_SIZE_VERY_SMALL_SIZE 24 -#define THUMBNAIL_SIZE_SMALLER_SIZE 32 -#define THUMBNAIL_SIZE_SMALL_SIZE 48 -#define THUMBNAIL_SIZE_NORMAL_SIZE 64 -#define THUMBNAIL_SIZE_LARGE_SIZE 96 -#define THUMBNAIL_SIZE_LARGER_SIZE 128 -#define THUMBNAIL_SIZE_VERY_LARGE_SIZE 256 - #endif /* __RSTTO_UTIL_H__ */ _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits