# HG changeset patch # User nadvornik # Date 1238336804 0 # Node ID 0e82a03c165b2d47d47c3d97d9400416ef8e3bc3 # Parent 9c16a93a0fdf8cb2dce19e8cfc1722e9338bf3b4 pane interface cleanup diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_comment.c --- a/src/bar_comment.c Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_comment.c Sun Mar 29 14:26:44 2009 +0000 @@ -210,7 +210,7 @@ } -GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height) +static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height) { PaneCommentData *pcd; GtkWidget *scrolled; diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_comment.h --- a/src/bar_comment.h Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_comment.h Sun Mar 29 14:26:44 2009 +0000 @@ -14,7 +14,6 @@ #ifndef BAR_COMMENT_H #define BAR_COMMENT_H -GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height); GtkWidget *bar_pane_comment_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_comment_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_exif.c --- a/src/bar_exif.c Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_exif.c Sun Mar 29 14:26:44 2009 +0000 @@ -710,7 +710,7 @@ ped->min_height = alloc->height; } -GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expanded, gboolean populate) +static GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expanded) { PaneExifData *ped; @@ -744,30 +744,6 @@ file_data_register_notify_func(bar_pane_exif_notify_cb, ped, NOTIFY_PRIORITY_LOW); - if (populate) - { - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("Camera"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("DateTime"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("ShutterSpeed"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("Aperture"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("ExposureBias"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("ISOSpeedRating"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("FocalLength"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("FocalLength35mmFilm"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("Flash"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, "Exif.Photo.ExposureProgram", NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, "Exif.Photo.MeteringMode", NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, "Exif.Photo.LightSource", NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("ColorProfile"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("SubjectDistance"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("Resolution"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, "Exif.Image.Orientation", NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("GPSPosition"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, EXIF_FORMATTED("GPSAltitude"), NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, "Exif.Image.ImageDescription", NULL, TRUE, FALSE); - bar_pane_exif_add_entry(ped, "Exif.Image.Copyright", NULL, TRUE, FALSE); - } - gtk_widget_show(ped->widget); return ped->widget; @@ -793,7 +769,7 @@ } bar_pane_translate_title(PANE_EXIF, id, &title); - ret = bar_pane_exif_new(id, title, expanded, FALSE); + ret = bar_pane_exif_new(id, title, expanded); g_free(title); g_free(id); return ret; diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_exif.h --- a/src/bar_exif.h Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_exif.h Sun Mar 29 14:26:44 2009 +0000 @@ -14,7 +14,6 @@ #ifndef BAR_EXIF_H #define BAR_EXIF_H -GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expanded, gboolean populate); GtkWidget *bar_pane_exif_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_histogram.c --- a/src/bar_histogram.c Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_histogram.c Sun Mar 29 14:26:44 2009 +0000 @@ -329,7 +329,7 @@ } -GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gint height, gboolean expanded, gint histogram_channel, gint histogram_mode) +static GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gint height, gboolean expanded, gint histogram_channel, gint histogram_mode) { PaneHistogramData *phd; diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_histogram.h --- a/src/bar_histogram.h Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_histogram.h Sun Mar 29 14:26:44 2009 +0000 @@ -14,7 +14,6 @@ #ifndef BAR_HISTOGRAM_H #define BAR_HISTOGRAM_H -GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gint height, gboolean expanded, gint histogram_channel, gint histogram_mode); GtkWidget *bar_pane_histogram_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_histogram_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_keywords.c --- a/src/bar_keywords.c Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_keywords.c Sun Mar 29 14:26:44 2009 +0000 @@ -1202,7 +1202,7 @@ } -GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded) +static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded) { PaneKeywordsData *pkd; GtkWidget *hbox; diff -r 9c16a93a0fdf -r 0e82a03c165b src/bar_keywords.h --- a/src/bar_keywords.h Sun Mar 29 14:20:44 2009 +0000 +++ b/src/bar_keywords.h Sun Mar 29 14:26:44 2009 +0000 @@ -14,7 +14,6 @@ #ifndef BAR_KEYWORDS_H #define BAR_KEYWORDS_H -GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded); GtkWidget *bar_pane_keywords_new_from_config(const gchar **attribute_names, const gchar **attribute_values); void bar_pane_keywords_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values);