pane interface cleanup

BestImageViewer · Mar 29, 2009 · ab645c9 · ab645c9
1 parent 0ceba72
commit ab645c9
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 33 deletions.
diff --git a/src/bar_comment.c b/src/bar_comment.c
@@ -210,7 +210,7 @@ static void bar_pane_comment_destroy(GtkWidget *widget, gpointer data)
 }
 
 
-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 --git a/src/bar_comment.h b/src/bar_comment.h
@@ -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 --git a/src/bar_exif.c b/src/bar_exif.c
@@ -710,7 +710,7 @@ static void bar_pane_exif_size_allocate(GtkWidget *pane, GtkAllocation *alloc, g
 	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 @@ GtkWidget *bar_pane_exif_new(const gchar *id, const gchar *title, gboolean expan
 
 	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 @@ GtkWidget *bar_pane_exif_new_from_config(const gchar **attribute_names, const gc
 		}
 
 	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 --git a/src/bar_exif.h b/src/bar_exif.h
@@ -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 --git a/src/bar_histogram.c b/src/bar_histogram.c
@@ -329,7 +329,7 @@ static gboolean bar_pane_histogram_press_cb(GtkWidget *widget, GdkEventButton *b
 }
 
 
-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 --git a/src/bar_histogram.h b/src/bar_histogram.h
@@ -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 --git a/src/bar_keywords.c b/src/bar_keywords.c
@@ -1202,7 +1202,7 @@ static void bar_pane_keywords_destroy(GtkWidget *widget, gpointer data)
 }
 
 
-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 --git a/src/bar_keywords.h b/src/bar_keywords.h
@@ -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);