[gnome-commander] noop: code cleanup
- From: Piotr Eljasiak <epiotr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-commander] noop: code cleanup
- Date: Mon, 19 Oct 2009 21:23:04 +0000 (UTC)
commit 2ee6287f51bb6eaca4d591436ad47fd937bb3bdd
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Mon Oct 19 23:21:15 2009 +0200
noop: code cleanup
src/dialogs/gnome-cmd-manage-profiles-dialog.cc | 2 +-
src/gnome-cmd-advrename-dialog.h | 2 +-
src/gnome-cmd-clist.cc | 10 ++--
src/gnome-cmd-clist.h | 8 +-
src/gnome-cmd-con-device.cc | 9 ++-
src/gnome-cmd-file-list.h | 2 +-
src/gnome-cmd-file-props-dialog.cc | 1 -
src/intviewer/bm_chartype.cc | 4 +-
src/intviewer/image-render.cc | 70 +++++++++++-----------
src/intviewer/inputmodes.cc | 14 ++--
src/intviewer/scroll-box.cc | 8 +-
src/intviewer/viewer-window.cc | 54 +++++++++---------
src/intviewer/viewer-window.h | 4 +-
src/main.cc | 2 +-
src/plugin_manager.cc | 4 +-
src/utils.cc | 8 +-
16 files changed, 101 insertions(+), 101 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-manage-profiles-dialog.cc b/src/dialogs/gnome-cmd-manage-profiles-dialog.cc
index eeb5678..04647fe 100644
--- a/src/dialogs/gnome-cmd-manage-profiles-dialog.cc
+++ b/src/dialogs/gnome-cmd-manage-profiles-dialog.cc
@@ -76,7 +76,7 @@ inline void add_profile(GtkWidget *view, GnomeCmdData::AdvrenameConfig::Profile
GtkTreePath *path = gtk_tree_model_get_path (model, &i);
gtk_widget_grab_focus (view);
gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, gtk_tree_view_get_column (GTK_TREE_VIEW (view),0), TRUE);
- gtk_tree_path_free(path);
+ gtk_tree_path_free (path);
}
diff --git a/src/gnome-cmd-advrename-dialog.h b/src/gnome-cmd-advrename-dialog.h
index 3cb7626..4468de7 100644
--- a/src/gnome-cmd-advrename-dialog.h
+++ b/src/gnome-cmd-advrename-dialog.h
@@ -24,7 +24,7 @@
#include "gnome-cmd-data.h"
#include "gnome-cmd-file-list.h"
-#define GNOME_CMD_TYPE_ADVRENAME_DIALOG (gnome_cmd_advrename_dialog_get_type())
+#define GNOME_CMD_TYPE_ADVRENAME_DIALOG (gnome_cmd_advrename_dialog_get_type ())
#define GNOME_CMD_ADVRENAME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_CMD_TYPE_ADVRENAME_DIALOG, GnomeCmdAdvrenameDialog))
#define GNOME_CMD_ADVRENAME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_CMD_TYPE_ADVRENAME_DIALOG, GnomeCmdAdvrenameDialogClass))
#define GNOME_CMD_IS_ADVRENAME_DIALOG(obj) (G_TYPE_INSTANCE_CHECK_TYPE ((obj), GNOME_CMD_TYPE_ADVRENAME_DIALOG))
diff --git a/src/gnome-cmd-clist.cc b/src/gnome-cmd-clist.cc
index c9f2999..1f9e303 100644
--- a/src/gnome-cmd-clist.cc
+++ b/src/gnome-cmd-clist.cc
@@ -527,7 +527,7 @@ static void draw_row (GtkCList *clist, GdkRectangle *area, gint row, GtkCListRow
****/
static void on_hadj_value_changed (GtkAdjustment *adjustment, GnomeCmdCList *clist)
{
- gtk_widget_draw(GTK_WIDGET(clist), NULL);
+ gtk_widget_draw (GTK_WIDGET(clist), NULL);
}
@@ -543,9 +543,9 @@ static void on_realize (GtkCList *clist, gpointer data)
if (clist->column[i].button)
GTK_WIDGET_UNSET_FLAGS (clist->column[i].button, GTK_CAN_FOCUS);
- if (GTK_CLIST(clist)->hadjustment)
- gtk_signal_connect_after(GTK_OBJECT(GTK_CLIST(clist)->hadjustment), "value-changed",
- GTK_SIGNAL_FUNC(on_hadj_value_changed), clist);
+ if (GTK_CLIST (clist)->hadjustment)
+ gtk_signal_connect_after (GTK_OBJECT(GTK_CLIST(clist)->hadjustment), "value-changed",
+ GTK_SIGNAL_FUNC (on_hadj_value_changed), clist);
}
@@ -627,7 +627,7 @@ GtkType gnome_cmd_clist_get_type ()
GtkWidget *gnome_cmd_clist_new_with_titles (gint columns, gchar **titles)
{
- GnomeCmdCList *clist = (GnomeCmdCList *) g_object_new (gnome_cmd_clist_get_type(), "n-columns", columns, NULL);
+ GnomeCmdCList *clist = (GnomeCmdCList *) g_object_new (GNOME_CMD_TYPE_CLIST, "n-columns", columns, NULL);
for (gint i=0; i<columns; i++)
gtk_clist_set_column_auto_resize (GTK_CLIST (clist), i, TRUE);
diff --git a/src/gnome-cmd-clist.h b/src/gnome-cmd-clist.h
index c2ce452..d74955a 100644
--- a/src/gnome-cmd-clist.h
+++ b/src/gnome-cmd-clist.h
@@ -20,10 +20,10 @@
#ifndef __GNOME_CMD_CLIST_H__
#define __GNOME_CMD_CLIST_H__
-#define GNOME_CMD_TYPE_CLIST (gnome_cmd_clist_get_type())
-#define GNOME_CMD_CLIST(obj) GTK_CHECK_CAST (obj, gnome_cmd_clist_get_type (), GnomeCmdCList)
-#define GNOME_CMD_CLIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gnome_cmd_clist_get_type (), GnomeCmdCListClass)
-#define GNOME_CMD_IS_CLIST(obj) GTK_CHECK_TYPE (obj, gnome_cmd_clist_get_type ())
+#define GNOME_CMD_TYPE_CLIST (gnome_cmd_clist_get_type ())
+#define GNOME_CMD_CLIST(obj) GTK_CHECK_CAST (obj, GNOME_CMD_TYPE_CLIST, GnomeCmdCList)
+#define GNOME_CMD_CLIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, GNOME_CMD_TYPE_CLIST, GnomeCmdCListClass)
+#define GNOME_CMD_IS_CLIST(obj) GTK_CHECK_TYPE (obj, GNOME_CMD_TYPE_CLIST)
struct GnomeCmdCListPrivate;
diff --git a/src/gnome-cmd-con-device.cc b/src/gnome-cmd-con-device.cc
index fb8560e..d7b3534 100644
--- a/src/gnome-cmd-con-device.cc
+++ b/src/gnome-cmd-con-device.cc
@@ -243,7 +243,7 @@ static gboolean dev_close (GnomeCmdCon *con)
DEBUG ('m', "umounting VFS volume \"%s\"\n", name);
g_free (name);
- gnome_vfs_volume_unmount(dev_con->priv->vfsvol, dev_vfs_umount_callback, NULL);
+ gnome_vfs_volume_unmount (dev_con->priv->vfsvol, dev_vfs_umount_callback, NULL);
}
}
else
@@ -312,7 +312,7 @@ static void destroy (GtkObject *object)
if (con->priv->vfsvol)
{
- gnome_vfs_volume_unref(con->priv->vfsvol);
+ gnome_vfs_volume_unref (con->priv->vfsvol);
con->priv->vfsvol = NULL;
}
@@ -515,8 +515,9 @@ void gnome_cmd_con_device_set_vfs_volume (GnomeCmdConDevice *dev, GnomeVFSVolume
g_return_if_fail (dev != NULL);
g_return_if_fail (dev->priv != NULL);
- if (dev->priv->vfsvol) {
- gnome_vfs_volume_unref(dev->priv->vfsvol);
+ if (dev->priv->vfsvol)
+ {
+ gnome_vfs_volume_unref (dev->priv->vfsvol);
dev->priv->vfsvol = NULL;
}
diff --git a/src/gnome-cmd-file-list.h b/src/gnome-cmd-file-list.h
index 7535a88..75fc8bc 100644
--- a/src/gnome-cmd-file-list.h
+++ b/src/gnome-cmd-file-list.h
@@ -25,7 +25,7 @@
#include "gnome-cmd-dir.h"
#include "gnome-cmd-clist.h"
-#define GNOME_CMD_TYPE_FILE_LIST (gnome_cmd_file_list_get_type())
+#define GNOME_CMD_TYPE_FILE_LIST (gnome_cmd_file_list_get_type ())
#define GNOME_CMD_FILE_LIST(obj) GTK_CHECK_CAST (obj, GNOME_CMD_TYPE_FILE_LIST, GnomeCmdFileList)
#define GNOME_CMD_IS_FILE_LIST(obj) GTK_CHECK_TYPE (obj, GNOME_CMD_TYPE_FILE_LIST)
diff --git a/src/gnome-cmd-file-props-dialog.cc b/src/gnome-cmd-file-props-dialog.cc
index d318cbf..76f1d00 100644
--- a/src/gnome-cmd-file-props-dialog.cc
+++ b/src/gnome-cmd-file-props-dialog.cc
@@ -489,7 +489,6 @@ inline GtkWidget *create_properties_tab (GnomeCmdFilePropsDialogPrivate *data)
add_sep (table, y++);
-
label = create_bold_label (dialog, _("Modified:"));
table_add (table, label, 0, y, GTK_FILL);
diff --git a/src/intviewer/bm_chartype.cc b/src/intviewer/bm_chartype.cc
index 0ad6291..de9def5 100644
--- a/src/intviewer/bm_chartype.cc
+++ b/src/intviewer/bm_chartype.cc
@@ -49,13 +49,13 @@ inline void bch_free(GHashTable *bch)
static void bch_set_value(GHashTable *bch, int key, int value)
{
- g_hash_table_insert(bch, (gpointer) key, (gpointer) value);
+ g_hash_table_insert (bch, (gpointer) key, (gpointer) value);
}
int bch_get_value(GViewerBMChartypeData *data, char_type key, int default_value)
{
- gint value = GPOINTER_TO_INT (g_hash_table_lookup(data->bad, GINT_TO_POINTER (CHARTYPE_CASE(key, data->case_sensitive))));
+ gint value = GPOINTER_TO_INT (g_hash_table_lookup (data->bad, GINT_TO_POINTER (CHARTYPE_CASE(key, data->case_sensitive))));
return value==0 ? default_value : value;
}
diff --git a/src/intviewer/image-render.cc b/src/intviewer/image-render.cc
index ceca5b1..91863c7 100644
--- a/src/intviewer/image-render.cc
+++ b/src/intviewer/image-render.cc
@@ -430,11 +430,11 @@ static gboolean image_render_expose (GtkWidget *widget, GdkEventExpose *event)
gint xc, yc;
if (w->priv->best_fit ||
- (gdk_pixbuf_get_width(w->priv->disp_pixbuf) < widget->allocation.width &&
- gdk_pixbuf_get_height(w->priv->disp_pixbuf) < widget->allocation.height))
+ (gdk_pixbuf_get_width (w->priv->disp_pixbuf) < widget->allocation.width &&
+ gdk_pixbuf_get_height (w->priv->disp_pixbuf) < widget->allocation.height))
{
- xc = widget->allocation.width / 2 - gdk_pixbuf_get_width(w->priv->disp_pixbuf)/2;
- yc = widget->allocation.height / 2 - gdk_pixbuf_get_height(w->priv->disp_pixbuf)/2;
+ xc = widget->allocation.width / 2 - gdk_pixbuf_get_width (w->priv->disp_pixbuf)/2;
+ yc = widget->allocation.height / 2 - gdk_pixbuf_get_height (w->priv->disp_pixbuf)/2;
gdk_draw_pixbuf(widget->window,
NULL,
@@ -450,36 +450,36 @@ static gboolean image_render_expose (GtkWidget *widget, GdkEventExpose *event)
gint dst_x, dst_y;
gint width, height;
- if (widget->allocation.width > gdk_pixbuf_get_width(w->priv->disp_pixbuf))
+ if (widget->allocation.width > gdk_pixbuf_get_width (w->priv->disp_pixbuf))
{
src_x = 0;
- dst_x = widget->allocation.width / 2 - gdk_pixbuf_get_width(w->priv->disp_pixbuf)/2;
- width = gdk_pixbuf_get_width(w->priv->disp_pixbuf);
+ dst_x = widget->allocation.width / 2 - gdk_pixbuf_get_width (w->priv->disp_pixbuf)/2;
+ width = gdk_pixbuf_get_width (w->priv->disp_pixbuf);
}
else
{
src_x = (int)w->priv->h_adjustment->value;
dst_x = 0;
- width = MIN(widget->allocation.width, gdk_pixbuf_get_width(w->priv->disp_pixbuf));
- if (src_x + width > gdk_pixbuf_get_width(w->priv->disp_pixbuf))
- src_x = gdk_pixbuf_get_width(w->priv->disp_pixbuf) - width;
+ width = MIN(widget->allocation.width, gdk_pixbuf_get_width (w->priv->disp_pixbuf));
+ if (src_x + width > gdk_pixbuf_get_width (w->priv->disp_pixbuf))
+ src_x = gdk_pixbuf_get_width (w->priv->disp_pixbuf) - width;
}
- if ((int)w->priv->h_adjustment->value > gdk_pixbuf_get_height(w->priv->disp_pixbuf))
+ if ((int)w->priv->h_adjustment->value > gdk_pixbuf_get_height (w->priv->disp_pixbuf))
{
src_y = 0;
- dst_y = widget->allocation.height / 2 - gdk_pixbuf_get_height(w->priv->disp_pixbuf)/2;
- height = gdk_pixbuf_get_height(w->priv->disp_pixbuf);
+ dst_y = widget->allocation.height / 2 - gdk_pixbuf_get_height (w->priv->disp_pixbuf)/2;
+ height = gdk_pixbuf_get_height (w->priv->disp_pixbuf);
}
else
{
src_y = (int)w->priv->v_adjustment->value;
dst_y = 0;
- height = MIN(widget->allocation.height, gdk_pixbuf_get_height(w->priv->disp_pixbuf));
+ height = MIN(widget->allocation.height, gdk_pixbuf_get_height (w->priv->disp_pixbuf));
- if (src_y + height > gdk_pixbuf_get_height(w->priv->disp_pixbuf))
- src_y = gdk_pixbuf_get_height(w->priv->disp_pixbuf) - height;
+ if (src_y + height > gdk_pixbuf_get_height (w->priv->disp_pixbuf))
+ src_y = gdk_pixbuf_get_height (w->priv->disp_pixbuf) - height;
}
#if 0
@@ -487,8 +487,8 @@ static gboolean image_render_expose (GtkWidget *widget, GdkEventExpose *event)
src_x, src_y,
dst_x, dst_y,
width, height,
- gdk_pixbuf_get_width(w->priv->disp_pixbuf),
- gdk_pixbuf_get_height(w->priv->disp_pixbuf),
+ gdk_pixbuf_get_width (w->priv->disp_pixbuf),
+ gdk_pixbuf_get_height (w->priv->disp_pixbuf),
widget->allocation.width,
widget->allocation.height,
(int)w->priv->h_adjustment->value,
@@ -725,7 +725,7 @@ static gpointer image_render_pixbuf_loading_thread (gpointer data)
GError *err = NULL;
ImageRender *obj = (ImageRender *) data;
- obj->priv->orig_pixbuf = gdk_pixbuf_new_from_file(obj->priv->filename, &err);
+ obj->priv->orig_pixbuf = gdk_pixbuf_new_from_file (obj->priv->filename, &err);
g_atomic_int_inc (&obj->priv->orig_pixbuf_loaded);
@@ -773,12 +773,12 @@ void image_render_load_scaled_pixbuf (ImageRender *obj)
GError *err = NULL;
- obj->priv->disp_pixbuf = gdk_pixbuf_new_from_file_at_scale(obj->priv->filename, width, height, TRUE, &err);
+ obj->priv->disp_pixbuf = gdk_pixbuf_new_from_file_at_scale (obj->priv->filename, width, height, TRUE, &err);
if (err)
{
- g_warning("pixbuf loading failed: %s", err->message);
- g_error_free(err);
+ g_warning ("pixbuf loading failed: %s", err->message);
+ g_error_free (err);
obj->priv->orig_pixbuf = NULL;
obj->priv->disp_pixbuf = NULL;
return;
@@ -836,13 +836,13 @@ static void image_render_prepare_disp_pixbuf (ImageRender *obj)
g_object_unref (obj->priv->disp_pixbuf);
obj->priv->disp_pixbuf = NULL;
- if (gdk_pixbuf_get_height(obj->priv->orig_pixbuf)==0)
+ if (gdk_pixbuf_get_height (obj->priv->orig_pixbuf)==0)
return;
if (obj->priv->best_fit)
{
- if (gdk_pixbuf_get_height(obj->priv->orig_pixbuf) < GTK_WIDGET (obj)->allocation.height &&
- gdk_pixbuf_get_width(obj->priv->orig_pixbuf) < GTK_WIDGET (obj)->allocation.width)
+ if (gdk_pixbuf_get_height (obj->priv->orig_pixbuf) < GTK_WIDGET (obj)->allocation.height &&
+ gdk_pixbuf_get_width (obj->priv->orig_pixbuf) < GTK_WIDGET (obj)->allocation.width)
{
// no need to scale down
@@ -853,15 +853,15 @@ static void image_render_prepare_disp_pixbuf (ImageRender *obj)
int height = GTK_WIDGET (obj)->allocation.height;
int width = (((double) GTK_WIDGET (obj)->allocation.height) /
- gdk_pixbuf_get_height(obj->priv->orig_pixbuf))*
- gdk_pixbuf_get_width(obj->priv->orig_pixbuf);
+ gdk_pixbuf_get_height (obj->priv->orig_pixbuf))*
+ gdk_pixbuf_get_width (obj->priv->orig_pixbuf);
if (width >= GTK_WIDGET (obj)->allocation.width)
{
width = GTK_WIDGET (obj)->allocation.width;
height = (((double)GTK_WIDGET (obj)->allocation.width) /
- gdk_pixbuf_get_width(obj->priv->orig_pixbuf))*
- gdk_pixbuf_get_height(obj->priv->orig_pixbuf);
+ gdk_pixbuf_get_width (obj->priv->orig_pixbuf))*
+ gdk_pixbuf_get_height (obj->priv->orig_pixbuf);
}
if (width<=1 || height<=1)
@@ -877,8 +877,8 @@ static void image_render_prepare_disp_pixbuf (ImageRender *obj)
// not "best_fit" = scaling mode
obj->priv->disp_pixbuf = gdk_pixbuf_scale_simple(
obj->priv->orig_pixbuf,
- (int)(gdk_pixbuf_get_width(obj->priv->orig_pixbuf) * obj->priv->scale_factor),
- (int)(gdk_pixbuf_get_height(obj->priv->orig_pixbuf) * obj->priv->scale_factor),
+ (int)(gdk_pixbuf_get_width (obj->priv->orig_pixbuf) * obj->priv->scale_factor),
+ (int)(gdk_pixbuf_get_height (obj->priv->orig_pixbuf) * obj->priv->scale_factor),
GDK_INTERP_NEAREST);
}
@@ -895,8 +895,8 @@ static void image_render_update_adjustments (ImageRender *obj)
return;
if (obj->priv->best_fit ||
- (gdk_pixbuf_get_width(obj->priv->disp_pixbuf) < GTK_WIDGET (obj)->allocation.width &&
- gdk_pixbuf_get_height(obj->priv->disp_pixbuf) < GTK_WIDGET (obj)->allocation.height))
+ (gdk_pixbuf_get_width (obj->priv->disp_pixbuf) < GTK_WIDGET (obj)->allocation.width &&
+ gdk_pixbuf_get_height (obj->priv->disp_pixbuf) < GTK_WIDGET (obj)->allocation.height))
{
if (obj->priv->h_adjustment)
{
@@ -918,14 +918,14 @@ static void image_render_update_adjustments (ImageRender *obj)
if (obj->priv->h_adjustment)
{
obj->priv->h_adjustment->lower = 0;
- obj->priv->h_adjustment->upper = gdk_pixbuf_get_width(obj->priv->disp_pixbuf);
+ obj->priv->h_adjustment->upper = gdk_pixbuf_get_width (obj->priv->disp_pixbuf);
obj->priv->h_adjustment->page_size = GTK_WIDGET (obj)->allocation.width;
gtk_adjustment_changed(obj->priv->h_adjustment);
}
if (obj->priv->v_adjustment)
{
obj->priv->v_adjustment->lower = 0;
- obj->priv->v_adjustment->upper = gdk_pixbuf_get_height(obj->priv->disp_pixbuf);
+ obj->priv->v_adjustment->upper = gdk_pixbuf_get_height (obj->priv->disp_pixbuf);
obj->priv->v_adjustment->page_size = GTK_WIDGET (obj)->allocation.height;
gtk_adjustment_changed(obj->priv->v_adjustment);
}
diff --git a/src/intviewer/inputmodes.cc b/src/intviewer/inputmodes.cc
index b29f152..5ced470 100644
--- a/src/intviewer/inputmodes.cc
+++ b/src/intviewer/inputmodes.cc
@@ -125,12 +125,12 @@ const char*gv_get_input_mode(GVInputModesData *imd)
void gv_set_input_mode(GVInputModesData *imd, const gchar *input_mode)
{
- if (g_ascii_strcasecmp(input_mode, "ASCII")==0 || g_ascii_strcasecmp(input_mode, "CP437")==0)
+ if (g_ascii_strcasecmp (input_mode, "ASCII")==0 || g_ascii_strcasecmp (input_mode, "CP437")==0)
{
inputmode_ascii_activate(imd, input_mode);
return;
}
- if (g_ascii_strcasecmp(input_mode, "UTF8")==0)
+ if (g_ascii_strcasecmp (input_mode, "UTF8")==0)
{
inputmode_utf8_activate(imd);
return;
@@ -209,13 +209,13 @@ static void inputmode_ascii_activate(GVInputModesData *imd, const gchar *encodin
g_free (imd->input_mode_name);
imd->input_mode_name = g_strdup ("ASCII");
- if (g_ascii_strcasecmp(encoding, "ASCII")==0)
+ if (g_ascii_strcasecmp (encoding, "ASCII")==0)
return;
/* Is this CP437 encoding ?
If so, use our special translation table.
(I could not get IConv to work with CP437....) */
- if (g_ascii_strcasecmp(encoding, "CP437")==0)
+ if (g_ascii_strcasecmp (encoding, "CP437")==0)
{
for (i=0;i<256;i++)
{
@@ -235,7 +235,7 @@ static void inputmode_ascii_activate(GVInputModesData *imd, const gchar *encodin
icnv = g_iconv_open("UTF8", encoding);
if (icnv == (GIConv)-1)
{
- g_warning("Failed to load charset conversions, using ASCII fallback.");
+ g_warning ("Failed to load charset conversions, using ASCII fallback.");
return;
}
for (i=0;i<256;i++)
@@ -274,7 +274,7 @@ static char_type inputmode_ascii_get_char(GVInputModesData *imd, offset_type off
if (value>255)
{
- g_warning("Got BYTE>255 (%d) ?!\n", value);
+ g_warning ("Got BYTE>255 (%d) ?!\n", value);
value = ' ';
}
@@ -427,7 +427,7 @@ static char_type inputmode_utf8_get_char(GVInputModesData *imd, offset_type offs
if (!utf8_is_valid_char(imd, offset))
{
- g_warning("invalid UTF characeter at offset %lu (%02x)", offset,
+ g_warning ("invalid UTF characeter at offset %lu (%02x)", offset,
(unsigned char)gv_input_mode_get_byte(imd, offset));
return '.';
}
diff --git a/src/intviewer/scroll-box.cc b/src/intviewer/scroll-box.cc
index e7af419..e7d65d8 100644
--- a/src/intviewer/scroll-box.cc
+++ b/src/intviewer/scroll-box.cc
@@ -93,7 +93,7 @@ static void scroll_box_class_init (ScrollBoxClass *klass)
GtkObjectClass *object_class;
object_class = GTK_OBJECT_CLASS (klass);
- parent_class = (GtkTableClass *) gtk_type_class(gtk_table_get_type());
+ parent_class = (GtkTableClass *) gtk_type_class (gtk_table_get_type ());
object_class->destroy = scroll_box_destroy;
}
@@ -101,10 +101,10 @@ static void scroll_box_class_init (ScrollBoxClass *klass)
static void scroll_box_init (ScrollBox *w)
{
- w->priv = g_new0(ScrollBoxPrivate, 1);
+ w->priv = g_new0 (ScrollBoxPrivate, 1);
- gtk_table_resize(GTK_TABLE(w), 2, 2);
- gtk_table_set_homogeneous(GTK_TABLE(w), FALSE);
+ gtk_table_resize (GTK_TABLE (w), 2, 2);
+ gtk_table_set_homogeneous (GTK_TABLE (w), FALSE);
w->priv->vscroll = gtk_vscrollbar_new (NULL);
gtk_widget_show (w->priv->vscroll);
diff --git a/src/intviewer/viewer-window.cc b/src/intviewer/viewer-window.cc
index 781b7e1..6594bb6 100644
--- a/src/intviewer/viewer-window.cc
+++ b/src/intviewer/viewer-window.cc
@@ -413,7 +413,7 @@ static gboolean gviewer_window_key_pressed(GtkWidget *widget, GdkEventKey *event
case GDK_w:
case GDK_W:
- gtk_widget_destroy(GTK_WIDGET (w));
+ gtk_widget_destroy (GTK_WIDGET (w));
return TRUE;
}
@@ -614,7 +614,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
case MI_RADIO:
if (!menudata->radio_list)
- g_warning("radio_list field is NULL in \"%s\" menu item", menudata->label);
+ g_warning ("radio_list field is NULL in \"%s\" menu item", menudata->label);
else
{
item = create_radio_menu_item(menudata->radio_list,
@@ -887,7 +887,7 @@ static void create_menu_items (GtkWidget *container, GtkAccelGroup *accel, gpoin
// Event Handlers
static void menu_file_close (GtkMenuItem *item, GViewerWindow *obj)
{
- gtk_widget_destroy(GTK_WIDGET (obj));
+ gtk_widget_destroy (GTK_WIDGET (obj));
}
@@ -1191,7 +1191,7 @@ static void menu_edit_find(GtkMenuItem *item, GViewerWindow *obj)
g_free (buffer);
}
- gtk_widget_destroy(w);
+ gtk_widget_destroy (w);
// call "find_next" to actually do the search
@@ -1265,17 +1265,17 @@ void gviewer_window_load_settings(/* out */ GViewerWindowSettings *settings)
strncpy(settings->variable_font_name, temp, sizeof(settings->variable_font_name));
g_free (temp);
- settings->hex_decimal_offset = gviewer_get_bool(GVIEWER_DEFAULT_PATH_PREFIX "hex_offset_display", TRUE);
- settings->wrap_mode = gviewer_get_bool(GVIEWER_DEFAULT_PATH_PREFIX "wrap_mode", TRUE);
+ settings->hex_decimal_offset = gviewer_get_bool (GVIEWER_DEFAULT_PATH_PREFIX "hex_offset_display", TRUE);
+ settings->wrap_mode = gviewer_get_bool (GVIEWER_DEFAULT_PATH_PREFIX "wrap_mode", TRUE);
- settings->font_size = gviewer_get_int(GVIEWER_DEFAULT_PATH_PREFIX "font_size", 12);
- settings->tab_size = gviewer_get_int(GVIEWER_DEFAULT_PATH_PREFIX "tab_size ", 8);
- settings->binary_bytes_per_line = gviewer_get_int(GVIEWER_DEFAULT_PATH_PREFIX "binary_bytes_per_line", 80);
+ settings->font_size = gviewer_get_int (GVIEWER_DEFAULT_PATH_PREFIX "font_size", 12);
+ settings->tab_size = gviewer_get_int (GVIEWER_DEFAULT_PATH_PREFIX "tab_size ", 8);
+ settings->binary_bytes_per_line = gviewer_get_int (GVIEWER_DEFAULT_PATH_PREFIX "binary_bytes_per_line", 80);
- settings->rect.x = gviewer_get_int(GVIEWER_DEFAULT_PATH_PREFIX "x", -2);
- settings->rect.y = gviewer_get_int(GVIEWER_DEFAULT_PATH_PREFIX "y", -2);
- settings->rect.width = gviewer_get_int(GVIEWER_DEFAULT_PATH_PREFIX "width", -1);
- settings->rect.height = gviewer_get_int(GVIEWER_DEFAULT_PATH_PREFIX "height", -1);
+ settings->rect.x = gviewer_get_int (GVIEWER_DEFAULT_PATH_PREFIX "x", -2);
+ settings->rect.y = gviewer_get_int (GVIEWER_DEFAULT_PATH_PREFIX "y", -2);
+ settings->rect.width = gviewer_get_int (GVIEWER_DEFAULT_PATH_PREFIX "width", -1);
+ settings->rect.height = gviewer_get_int (GVIEWER_DEFAULT_PATH_PREFIX "height", -1);
}
@@ -1288,23 +1288,23 @@ static void menu_settings_save_settings(GtkMenuItem *item, GViewerWindow *obj)
gviewer_window_get_current_settings(obj, &settings);
- gnome_config_set_string(GVIEWER_DEFAULT_PATH_PREFIX "charset", settings.charset);
- gnome_config_set_string(GVIEWER_DEFAULT_PATH_PREFIX "fixed_font_name", settings.fixed_font_name);
- gnome_config_set_string(GVIEWER_DEFAULT_PATH_PREFIX "variable_font_name", settings.variable_font_name);
+ gnome_config_set_string (GVIEWER_DEFAULT_PATH_PREFIX "charset", settings.charset);
+ gnome_config_set_string (GVIEWER_DEFAULT_PATH_PREFIX "fixed_font_name", settings.fixed_font_name);
+ gnome_config_set_string (GVIEWER_DEFAULT_PATH_PREFIX "variable_font_name", settings.variable_font_name);
- gnome_config_set_bool(GVIEWER_DEFAULT_PATH_PREFIX "hex_offset_display", settings.hex_decimal_offset);
- gnome_config_set_bool(GVIEWER_DEFAULT_PATH_PREFIX "wrap_mode", settings.wrap_mode);
+ gnome_config_set_bool (GVIEWER_DEFAULT_PATH_PREFIX "hex_offset_display", settings.hex_decimal_offset);
+ gnome_config_set_bool (GVIEWER_DEFAULT_PATH_PREFIX "wrap_mode", settings.wrap_mode);
- gnome_config_set_int(GVIEWER_DEFAULT_PATH_PREFIX "font_size", settings.font_size);
- gnome_config_set_int(GVIEWER_DEFAULT_PATH_PREFIX "tab_size ", settings.tab_size);
- gnome_config_set_int(GVIEWER_DEFAULT_PATH_PREFIX "binary_bytes_per_line", settings.binary_bytes_per_line);
+ gnome_config_set_int (GVIEWER_DEFAULT_PATH_PREFIX "font_size", settings.font_size);
+ gnome_config_set_int (GVIEWER_DEFAULT_PATH_PREFIX "tab_size ", settings.tab_size);
+ gnome_config_set_int (GVIEWER_DEFAULT_PATH_PREFIX "binary_bytes_per_line", settings.binary_bytes_per_line);
+
+ gnome_config_set_int (GVIEWER_DEFAULT_PATH_PREFIX "x", settings.rect.x);
+ gnome_config_set_int (GVIEWER_DEFAULT_PATH_PREFIX "y", settings.rect.y);
+ gnome_config_set_int (GVIEWER_DEFAULT_PATH_PREFIX "width", settings.rect.width);
+ gnome_config_set_int (GVIEWER_DEFAULT_PATH_PREFIX "height", settings.rect.height);
- gnome_config_set_int(GVIEWER_DEFAULT_PATH_PREFIX "x", settings.rect.x);
- gnome_config_set_int(GVIEWER_DEFAULT_PATH_PREFIX "y", settings.rect.y);
- gnome_config_set_int(GVIEWER_DEFAULT_PATH_PREFIX "width", settings.rect.width);
- gnome_config_set_int(GVIEWER_DEFAULT_PATH_PREFIX "height", settings.rect.height);
-
- gnome_config_sync();
+ gnome_config_sync ();
}
diff --git a/src/intviewer/viewer-window.h b/src/intviewer/viewer-window.h
index 4b5270e..ede26b8 100644
--- a/src/intviewer/viewer-window.h
+++ b/src/intviewer/viewer-window.h
@@ -31,9 +31,9 @@
#define GVIEWER_WINDOW(obj) \
GTK_CHECK_CAST (obj, gviewer_window_get_type (), GViewerWindow)
#define GVIEWER_WINDOW_CLASS(clss) \
- GTK_CHECK_CLASS_CAST (clss, gviewer_window_get_type(), GViewerWindowClass)
+ GTK_CHECK_CLASS_CAST (clss, gviewer_window_get_type (), GViewerWindowClass)
#define IS_GVIEWER_WINDOW(obj) \
- GTK_CHECK_TYPE (obj, gviewer_window_get_type())
+ GTK_CHECK_TYPE (obj, gviewer_window_get_type ())
struct GViewerWindowSettings
diff --git a/src/main.cc b/src/main.cc
index 3552e41..8fe3267 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -99,7 +99,7 @@ int main (int argc, char *argv[])
#ifdef HAVE_LOCALE_H
if (setlocale(LC_ALL, "") == NULL)
- g_warning("Error while processing locales, call to setlocale failed");
+ g_warning ("Error while processing locales, call to setlocale failed");
locale_information = localeconv();
#endif
diff --git a/src/plugin_manager.cc b/src/plugin_manager.cc
index e3bb27c..246d4a6 100644
--- a/src/plugin_manager.cc
+++ b/src/plugin_manager.cc
@@ -211,7 +211,7 @@ void plugin_manager_init ()
}
// find user plugins
- gchar *user_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir(), ".gnome-commander/plugins", NULL);
+ gchar *user_dir = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome-commander/plugins", NULL);
create_dir_if_needed (user_dir);
scan_plugins_in_dir (user_dir);
g_free (user_dir);
@@ -455,6 +455,6 @@ void plugin_manager_show ()
gnome_cmd_dialog_set_transient_for (GNOME_CMD_DIALOG (dialog), GTK_WINDOW (main_win));
gtk_widget_set_size_request (GTK_WIDGET (dialog), 500, 300);
- gtk_window_set_resizable((GtkWindow *) GTK_WIDGET (dialog), TRUE);
+ gtk_window_set_resizable ((GtkWindow *) GTK_WIDGET (dialog), TRUE);
gtk_widget_show_all (GTK_WIDGET (dialog));
}
diff --git a/src/utils.cc b/src/utils.cc
index 14c1028..51c4257 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -109,7 +109,7 @@ void warn_print (const gchar *fmt, ...)
va_start (argptr,fmt);
vsnprintf (string,sizeof(string),fmt,argptr);
va_end (argptr);
- g_printerr("WARNING: %s", string);
+ g_printerr ("WARNING: %s", string);
}
@@ -230,7 +230,7 @@ gint run_simple_dialog (GtkWidget *parent, gboolean ignore_close_box,
}
while (ignore_close_box && result == GTK_RESPONSE_DELETE_EVENT);
- gtk_widget_destroy(dialog);
+ gtk_widget_destroy (dialog);
return result;
}
@@ -1138,7 +1138,7 @@ GtkWidget *create_ui_pixmap (GtkWidget *unused, GnomeUIPixmapType pixmap_type, g
default:
g_assert_not_reached ();
- g_warning("Invalid pixmap_type %d", (int) pixmap_type);
+ g_warning ("Invalid pixmap_type %d", (int) pixmap_type);
}
return pixmap;
@@ -1247,7 +1247,7 @@ gboolean create_dir_if_needed (const gchar *dpath)
}
}
else
- g_warning(_("Couldn't read from the directory %s: %s"), dpath, strerror (errno));
+ g_warning (_("Couldn't read from the directory %s: %s"), dpath, strerror (errno));
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]