diff src/bar.c @ 2185:c14a1d8e6aa4

Trim trailing white spaces on empty lines.
author Laurent Monin <zas@norz.org>
date Thu, 30 Aug 2012 18:32:32 +0200
parents 9cdebd070874
children 95507e596256
line wrap: on
line diff
--- a/src/bar.c	Thu Aug 30 18:31:41 2012 +0200
+++ b/src/bar.c	Thu Aug 30 18:32:32 2012 +0200
@@ -202,9 +202,9 @@
 	if (!expander) return;
 	box = gtk_widget_get_ancestor(expander, GTK_TYPE_BOX);
 	if (!box) return;
-	
+
 	gtk_container_child_get(GTK_CONTAINER(box), expander, "position", &pos, NULL);
-	
+
 	if (single_step)
 		{
 		pos = up ? (pos - 1) : (pos + 1);
@@ -214,7 +214,7 @@
 		{
 		pos = up ? 0 : -1;
 		}
-	
+
 	gtk_box_reorder_child(GTK_BOX(box), expander, pos);
 }
 
@@ -253,14 +253,14 @@
 	const gchar *config;
 
 	if (!id) return;
-	
+
 	while (pane->id)
 		{
 		if (strcmp(pane->id, id) == 0) break;
 		pane++;
 		}
 	if (!pane->id) return;
-	
+
 	config = bar_pane_get_default_config(id);
 	if (config) load_config_from_buf(config, strlen(config), FALSE);
 
@@ -289,7 +289,7 @@
 			bar = gtk_widget_get_parent(bar);
 		if (!bar) return;
 		}
- 
+
 	menu = popup_menu_short_lived();
 
 	if (expander)
@@ -310,7 +310,7 @@
 		g_object_set_data(G_OBJECT(item), "pane_add_id", pane->id);
 		pane++;
 		}
-	
+
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, bar, 0, GDK_CURRENT_TIME);
 }
 
@@ -344,7 +344,7 @@
 	bd->fd = file_data_ref(fd);
 
 	gtk_container_foreach(GTK_CONTAINER(bd->vbox), bar_pane_set_fd_cb, fd);
-	
+
 	gtk_label_set_text(GTK_LABEL(bd->label_file_name), (bd->fd) ? bd->fd->name : "");
 
 }
@@ -371,19 +371,19 @@
 	BarData *bd;
 	GList *list, *work;
 	gboolean ret = FALSE;
-	
+
 	bd = g_object_get_data(G_OBJECT(bar), "bar_data");
 	if (!bd) return FALSE;
 
 	list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
-	
+
 	work = list;
 	while (work)
 		{
 		GtkWidget *widget = gtk_bin_get_child(GTK_BIN(work->data));
 		PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
 		if (!pd) continue;
-	
+
 		if (pd->pane_event && pd->pane_event(widget, event))
 			{
 			ret = TRUE;
@@ -400,21 +400,21 @@
 	BarData *bd;
 	GList *list, *work;
 	GtkWidget *ret = NULL;
-	
+
 	if (!id || !id[0]) return NULL;
-	
+
 	bd = g_object_get_data(G_OBJECT(bar), "bar_data");
 	if (!bd) return NULL;
 
 	list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
-	
+
 	work = list;
 	while (work)
 		{
 		GtkWidget *widget = gtk_bin_get_child(GTK_BIN(work->data));
 		PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
 		if (!pd) continue;
-	
+
 		if (type == pd->type && strcmp(id, pd->id) == 0)
 			{
 			ret = widget;
@@ -430,12 +430,12 @@
 {
 	BarData *bd;
 	GList *list, *work;
-	
+
 	bd = g_object_get_data(G_OBJECT(bar), "bar_data");
 	if (!bd) return;
 
 	list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
-	
+
 	work = list;
 	while (work)
 		{
@@ -452,7 +452,7 @@
 	GList *list, *work;
 
 	if (!bar) return;
-	
+
 	bd = g_object_get_data(G_OBJECT(bar), "bar_data");
 	if (!bd) return;
 
@@ -460,7 +460,7 @@
 	write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
 	write_uint_option(outstr, indent, "width", bd->width);
 	WRITE_STRING(">");
-	
+
 	indent++;
 	WRITE_NL(); WRITE_STRING("<clear/>");
 
@@ -489,11 +489,11 @@
 {
 	PaneData *pd = g_object_get_data(G_OBJECT(pane), "pane_data");
 	GtkWidget *expander;
-	
+
 	if (!pd) return;
 
 	expander = gtk_widget_get_parent(pane);
-	
+
 	gtk_expander_set_expanded(GTK_EXPANDER(expander), pd->expanded);
 }
 
@@ -502,25 +502,25 @@
 	GtkWidget *expander;
 	BarData *bd = g_object_get_data(G_OBJECT(bar), "bar_data");
 	PaneData *pd = g_object_get_data(G_OBJECT(pane), "pane_data");
-	
+
 	if (!bd) return;
 
 	pd->lw = bd->lw;
 	pd->bar = bar;
-	
+
 	expander = gtk_expander_new(NULL);
 	if (pd && pd->title)
 		{
 		gtk_expander_set_label_widget(GTK_EXPANDER(expander), pd->title);
 		gtk_widget_show(pd->title);
 		}
-		
+
 	gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0);
-	
+
 	g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd);
-	
+
 	gtk_container_add(GTK_CONTAINER(expander), pane);
-	
+
 	gtk_expander_set_expanded(GTK_EXPANDER(expander), pd->expanded);
 
 	gtk_widget_show(expander);
@@ -533,7 +533,7 @@
 {
 	const gchar *populate_id[] = {"histogram", "title", "keywords", "comment", "exif", NULL};
 	const gchar **id = populate_id;
-	
+
 	while (*id)
 		{
 		const gchar *config = bar_pane_get_default_config(*id);
@@ -545,14 +545,14 @@
 static void bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
 {
 	BarData *bd = data;
-	
+
 	bd->width = allocation->width;
 }
 
 gint bar_get_width(GtkWidget *bar)
 {
 	BarData *bd;
-	
+
 	bd = g_object_get_data(G_OBJECT(bar), "bar_data");
 	if (!bd) return 0;
 
@@ -601,7 +601,7 @@
 	bd = g_new0(BarData, 1);
 
 	bd->lw = lw;
-	
+
 	bd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
 	g_object_set_data(G_OBJECT(bd->widget), "bar_data", bd);
 	g_signal_connect(G_OBJECT(bd->widget), "destroy",
@@ -660,11 +660,11 @@
 
 		if (READ_BOOL_FULL("enabled", enabled)) continue;
 		if (READ_INT_FULL("width", width)) continue;
-		
+
 
 		log_printf("unknown attribute %s = %s\n", option, value);
 		}
-	
+
 	gtk_widget_set_size_request(bar, width, -1);
 	if (enabled)
 		{
@@ -696,7 +696,7 @@
 gboolean bar_pane_translate_title(PaneType type, const gchar *id, gchar **title)
 {
 	const KnownPanes *pane = known_panes;
-	
+
 	if (!title) return FALSE;
 	while (pane->id)
 		{
@@ -704,9 +704,9 @@
 		pane++;
 		}
 	if (!pane->id) return FALSE;
-	
+
 	if (*title && **title && strcmp(pane->title, *title) != 0) return FALSE;
-	
+
 	g_free(*title);
 	*title = g_strdup(_(pane->title));
 	return TRUE;
@@ -715,7 +715,7 @@
 const gchar *bar_pane_get_default_config(const gchar *id)
 {
 	const KnownPanes *pane = known_panes;
-	
+
 	while (pane->id)
 		{
 		if (strcmp(pane->id, id) == 0) break;
@@ -724,5 +724,5 @@
 	if (!pane->id) return NULL;
 	return pane->config;
 }
-	
+
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */