Skip to content

Commit

Permalink
Trim trailing white spaces.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zas
zas committed Aug 30, 2012
1 parent 2dfa5f5 commit e436ea5
Show file tree
Hide file tree
Showing 51 changed files with 355 additions and 355 deletions.
10 changes: 5 additions & 5 deletions src/advanced_exif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static void advanced_exif_update(ExifWin *ew)
g_free(text);
elements = g_strdup_printf("%d", exif_item_get_elements(item));
description = exif_item_get_description(item);
if (!description || *description == '\0')
if (!description || *description == '\0')
{
g_free(description);
description = g_strdup(tag_name);
Expand Down Expand Up @@ -176,10 +176,10 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context,
guint time, gpointer data)
{
//ExifWin *ew = data;
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
GtkTreeIter iter;

if (gtk_tree_selection_get_selected(sel, NULL, &iter))
if (gtk_tree_selection_get_selected(sel, NULL, &iter))
{
GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview));
gchar *key;
Expand All @@ -196,10 +196,10 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *context,
static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer data)
{
//ExifWin *ew = data;
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
GtkTreeIter iter;

if (gtk_tree_selection_get_selected(sel, NULL, &iter))
if (gtk_tree_selection_get_selected(sel, NULL, &iter))
{
GtkTreeModel *store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview));
gchar *key;
Expand Down
40 changes: 20 additions & 20 deletions src/bar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct _KnownPanes
const gchar *config;
};

static const gchar default_config_histogram[] =
static const gchar default_config_histogram[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -49,7 +49,7 @@ static const gchar default_config_histogram[] =
" </layout>"
"</gq>";

static const gchar default_config_title[] =
static const gchar default_config_title[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -58,7 +58,7 @@ static const gchar default_config_title[] =
" </layout>"
"</gq>";

static const gchar default_config_keywords[] =
static const gchar default_config_keywords[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -67,7 +67,7 @@ static const gchar default_config_keywords[] =
" </layout>"
"</gq>";

static const gchar default_config_comment[] =
static const gchar default_config_comment[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -76,7 +76,7 @@ static const gchar default_config_comment[] =
" </layout>"
"</gq>";

static const gchar default_config_exif[] =
static const gchar default_config_exif[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -102,7 +102,7 @@ static const gchar default_config_exif[] =
" </layout>"
"</gq>";

static const gchar default_config_file_info[] =
static const gchar default_config_file_info[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -115,7 +115,7 @@ static const gchar default_config_file_info[] =
" </layout>"
"</gq>";

static const gchar default_config_location[] =
static const gchar default_config_location[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -132,7 +132,7 @@ static const gchar default_config_location[] =
" </layout>"
"</gq>";

static const gchar default_config_copyright[] =
static const gchar default_config_copyright[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand All @@ -147,7 +147,7 @@ static const gchar default_config_copyright[] =

#ifdef HAVE_LIBCHAMPLAIN
#ifdef HAVE_LIBCHAMPLAIN_GTK
static const gchar default_config_gps[] =
static const gchar default_config_gps[] =
"<gq>"
" <layout id = '_current_'>"
" <bar>"
Expand Down Expand Up @@ -276,10 +276,10 @@ static void bar_menu_popup(GtkWidget *widget)
BarData *bd;

bd = g_object_get_data(G_OBJECT(widget), "bar_data");
if (bd)
if (bd)
{
expander = NULL;
bar = widget;
bar = widget;
}
else
{
Expand Down Expand Up @@ -315,15 +315,15 @@ static void bar_menu_popup(GtkWidget *widget)
}


static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
bar_menu_popup(widget);
return TRUE;
}
return FALSE;
}
}


static void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
Expand Down Expand Up @@ -464,7 +464,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
indent++;
WRITE_NL(); WRITE_STRING("<clear/>");

list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
work = list;
while (work)
{
Expand Down Expand Up @@ -517,7 +517,7 @@ void bar_add(GtkWidget *bar, GtkWidget *pane)

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);
g_signal_connect(expander, "button_release_event", G_CALLBACK(bar_menu_cb), bd);

gtk_container_add(GTK_CONTAINER(expander), pane);

Expand Down Expand Up @@ -578,7 +578,7 @@ static void bar_destroy(GtkWidget *widget, gpointer data)
}

#ifdef HAVE_LIBCHAMPLAIN_GTK
/*
/*
FIXME: this is an ugly hack that works around this bug:
https://bugzilla.gnome.org/show_bug.cgi?id=590692
http://bugzilla.openedhand.com/show_bug.cgi?id=1751
Expand Down Expand Up @@ -610,7 +610,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
g_signal_connect(G_OBJECT(bd->widget), "size-allocate",
G_CALLBACK(bar_size_allocate), bd);

g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd);
g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd);

bd->width = SIDEBAR_DEFAULT_WIDTH;
gtk_widget_set_size_request(bd->widget, bd->width, -1);
Expand Down Expand Up @@ -639,7 +639,7 @@ GtkWidget *bar_new(LayoutWindow *lw)
gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))), GTK_SHADOW_NONE);

#ifdef HAVE_LIBCHAMPLAIN_GTK
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL);
g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL);
#endif

gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
Expand All @@ -666,7 +666,7 @@ GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names,
}

gtk_widget_set_size_request(bar, width, -1);
if (enabled)
if (enabled)
{
gtk_widget_show(bar);
}
Expand Down
4 changes: 2 additions & 2 deletions src/bar_comment.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,14 @@ static void bar_pane_comment_write_config(GtkWidget *pane, GString *outstr, gint
write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pcd->pane.title)));
WRITE_BOOL(pcd->pane, expanded);
WRITE_CHAR(*pcd, key);
WRITE_INT(*pcd, height);
WRITE_INT(*pcd, height);
WRITE_STRING("/>");
}

static void bar_pane_comment_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
PaneCommentData *pcd = data;
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pcd->fd)
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pcd->fd)
{
DEBUG_1("Notify pane_comment: %s %04x", fd->path, type);

Expand Down
18 changes: 9 additions & 9 deletions src/bar_exif.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static void bar_pane_exif_update(PaneExifData *ped)

ped->all_hidden = TRUE;

list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
while (work)
{
Expand Down Expand Up @@ -293,7 +293,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
ped = g_object_get_data(G_OBJECT(bar), "pane_data");
if (!ped) return FALSE;

list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
while (!ret && work)
{
Expand All @@ -310,7 +310,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
PaneExifData *ped = data;
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd)
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd)
{
DEBUG_1("Notify pane_exif: %s %04x", fd->path, type);
bar_pane_exif_update(ped);
Expand Down Expand Up @@ -385,7 +385,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *context,
break;
}

list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
pos = 0;
while (work)
Expand Down Expand Up @@ -474,7 +474,7 @@ static void bar_pane_exif_edit_ok_cb(GenericDialog *gd, gpointer data)

if (ped)
{
bar_pane_exif_add_entry(ped,
bar_pane_exif_add_entry(ped,
gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)),
gtk_entry_get_text(GTK_ENTRY(cdd->title_entry)),
cdd->if_set, cdd->editable);
Expand Down Expand Up @@ -627,16 +627,16 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped)
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME);
}

static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
PaneExifData *ped = data;
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
bar_pane_exif_menu_popup(widget, ped);
return TRUE;
}
return FALSE;
}
}



Expand Down Expand Up @@ -668,7 +668,7 @@ static void bar_pane_exif_write_config(GtkWidget *pane, GString *outstr, gint in
WRITE_STRING(">");
indent++;

list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
work = list;
while (work)
{
Expand Down
14 changes: 7 additions & 7 deletions src/bar_gps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ static void bar_pane_gps_update(PaneGPSData *pgd)
else
{
return;
}
}
}

/* Delete any markers currently displayed
Expand Down Expand Up @@ -522,8 +522,8 @@ static void bar_pane_gps_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
PaneGPSData *pgd = data;

if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) &&
g_list_find(pgd->selection_list, fd))
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) &&
g_list_find(pgd->selection_list, fd))
{
bar_pane_gps_update(pgd);
}
Expand Down Expand Up @@ -562,11 +562,11 @@ static GtkWidget *bar_pane_gps_menu(PaneGPSData *pgd)
{
map_desc = (ChamplainMapSourceDesc *)(map_list->data);

menu_item_add_radio(menu,
menu_item_add_radio(menu,
champlain_map_source_desc_get_name(map_desc),
(gpointer)champlain_map_source_desc_get_id(map_desc),
strcmp(champlain_map_source_desc_get_id(map_desc), current) == 0,
G_CALLBACK(bar_pane_gps_change_map_cb), pgd);
(gpointer)champlain_map_source_desc_get_id(map_desc),
strcmp(champlain_map_source_desc_get_id(map_desc), current) == 0,
G_CALLBACK(bar_pane_gps_change_map_cb), pgd);

map_list = g_slist_next(map_list);
}
Expand Down
10 changes: 5 additions & 5 deletions src/bar_histogram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static void bar_pane_histogram_update(PaneHistogramData *phd)
if (!phd->histogram_width || !phd->histogram_height || !phd->fd) return;

/* histmap_get is relatively expensive, run it only when we really need it
and with lower priority than pixbuf_renderer
and with lower priority than pixbuf_renderer
FIXME: this does not work for fullscreen*/
if (gtk_widget_is_drawable(phd->drawing_area))
{
Expand Down Expand Up @@ -87,7 +87,7 @@ static gboolean bar_pane_histogram_update_cb(gpointer data)
if (phd->fd == NULL) return FALSE;
histmap = histmap_get(phd->fd);

if (!histmap)
if (!histmap)
{
histmap_start_idle(phd->fd);
return FALSE;
Expand Down Expand Up @@ -133,7 +133,7 @@ static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gi
static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
PaneHistogramData *phd = data;
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_HISTMAP | NOTIFY_PIXBUF)) && fd == phd->fd)
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_HISTMAP | NOTIFY_PIXBUF)) && fd == phd->fd)
{
DEBUG_1("Notify pane_histogram: %s %04x", fd->path, type);
bar_pane_histogram_update(phd);
Expand Down Expand Up @@ -310,10 +310,10 @@ static GtkWidget *bar_pane_histogram_new(const gchar *id, const gchar *title, gi
G_CALLBACK(bar_pane_histogram_size_cb), phd);

#if GTK_CHECK_VERSION(3,0,0)
g_signal_connect(G_OBJECT(phd->drawing_area), "draw",
g_signal_connect(G_OBJECT(phd->drawing_area), "draw",
G_CALLBACK(bar_pane_histogram_draw_cb), phd);
#else
g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event",
g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event",
G_CALLBACK(bar_pane_histogram_expose_event_cb), phd);
#endif

Expand Down
Loading

0 comments on commit e436ea5

Please sign in to comment.