gnome-commander r2015 - in trunk/src: . intviewer
- From: epiotr svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-commander r2015 - in trunk/src: . intviewer
- Date: Wed, 27 Aug 2008 20:59:35 +0000 (UTC)
Author: epiotr
Date: Wed Aug 27 20:59:35 2008
New Revision: 2015
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2015&view=rev
Log:
Code cleanup
Modified:
trunk/src/filter.h
trunk/src/gnome-cmd-advrename-lexer.ll
trunk/src/gnome-cmd-chmod-component.cc
trunk/src/gnome-cmd-chmod-dialog.cc
trunk/src/gnome-cmd-clist.cc
trunk/src/gnome-cmd-combo.cc
trunk/src/gnome-cmd-con-device.cc
trunk/src/gnome-cmd-con-dialog.cc
trunk/src/gnome-cmd-con-list.cc
trunk/src/gnome-cmd-con.cc
trunk/src/gnome-cmd-data.cc
trunk/src/gnome-cmd-data.h
trunk/src/gnome-cmd-dir-indicator.cc
trunk/src/gnome-cmd-file-list.cc
trunk/src/gnome-cmd-file-list.h
trunk/src/gnome-cmd-file-selector.cc
trunk/src/gnome-cmd-file.cc
trunk/src/gnome-cmd-main-win.cc
trunk/src/gnome-cmd-options-dialog.cc
trunk/src/intviewer/image-render.cc
trunk/src/intviewer/text-render.cc
trunk/src/intviewer/viewer-widget.cc
trunk/src/intviewer/viewer-window.cc
trunk/src/intviewer/viewer-window.h
trunk/src/owner.cc
trunk/src/utils.cc
Modified: trunk/src/filter.h
==============================================================================
--- trunk/src/filter.h (original)
+++ trunk/src/filter.h Wed Aug 27 20:59:35 2008
@@ -36,7 +36,7 @@
char *fn_exp; // fnmatch filtering stuff
int fn_flags; // fnmatch filtering stuff
- Filter(const gchar *exp, gboolean case_sens,Type type);
+ Filter(const gchar *exp, gboolean case_sens, Type type);
~Filter();
gboolean match(const gchar *text);
Modified: trunk/src/gnome-cmd-advrename-lexer.ll
==============================================================================
--- trunk/src/gnome-cmd-advrename-lexer.ll (original)
+++ trunk/src/gnome-cmd-advrename-lexer.ll Wed Aug 27 20:59:35 2008
@@ -43,7 +43,7 @@
#define ECHO { \
- CHUNK *p = g_new0 (CHUNK,1); \
+ CHUNK *p = g_new0 (CHUNK, 1); \
\
p->type = TEXT; \
p->s = g_string_new(yytext); \
Modified: trunk/src/gnome-cmd-chmod-component.cc
==============================================================================
--- trunk/src/gnome-cmd-chmod-component.cc (original)
+++ trunk/src/gnome-cmd-chmod-component.cc Wed Aug 27 20:59:35 2008
@@ -100,7 +100,7 @@
klass->perms_changed = on_perms_changed;
chmod_component_signals[PERMS_CHANGED] =
- gtk_signal_new ("perms_changed",
+ gtk_signal_new ("perms-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdChmodComponentClass, perms_changed),
Modified: trunk/src/gnome-cmd-chmod-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-chmod-dialog.cc (original)
+++ trunk/src/gnome-cmd-chmod-dialog.cc Wed Aug 27 20:59:35 2008
@@ -226,7 +226,7 @@
gtk_signal_connect (GTK_OBJECT (dialog->priv->recurse_check), "toggled",
GTK_SIGNAL_FUNC (on_toggle_recurse), chmod_dialog);
- gtk_signal_connect (GTK_OBJECT (dialog->priv->chmod_component), "perms_changed",
+ gtk_signal_connect (GTK_OBJECT (dialog->priv->chmod_component), "perms-changed",
GTK_SIGNAL_FUNC (on_perms_changed), chmod_dialog);
}
Modified: trunk/src/gnome-cmd-clist.cc
==============================================================================
--- trunk/src/gnome-cmd-clist.cc (original)
+++ trunk/src/gnome-cmd-clist.cc Wed Aug 27 20:59:35 2008
@@ -341,7 +341,7 @@
intersect_rectangle.height);
}
- if (!gdk_rectangle_intersect (area, &row_rectangle,&intersect_rectangle))
+ if (!gdk_rectangle_intersect (area, &row_rectangle, &intersect_rectangle))
return;
}
@@ -525,7 +525,7 @@
****/
static void on_hadj_value_changed (GtkAdjustment *adjustment, GnomeCmdCList *clist)
{
- gtk_widget_draw(GTK_WIDGET(clist),NULL);
+ gtk_widget_draw(GTK_WIDGET(clist), NULL);
}
@@ -590,7 +590,7 @@
GTK_CLIST (clist)->focus_row = 0;
- gtk_signal_connect_after (GTK_OBJECT (clist), "scroll_vertical", GTK_SIGNAL_FUNC (on_scroll_vertical), NULL);
+ gtk_signal_connect_after (GTK_OBJECT (clist), "scroll-vertical", GTK_SIGNAL_FUNC (on_scroll_vertical), NULL);
gtk_signal_connect (GTK_OBJECT (clist), "realize", GTK_SIGNAL_FUNC (on_realize), NULL);
}
Modified: trunk/src/gnome-cmd-combo.cc
==============================================================================
--- trunk/src/gnome-cmd-combo.cc (original)
+++ trunk/src/gnome-cmd-combo.cc Wed Aug 27 20:59:35 2008
@@ -321,7 +321,7 @@
GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
combo_signals[ITEM_SELECTED] =
- gtk_signal_new ("item_selected",
+ gtk_signal_new ("item-selected",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdComboClass, item_selected),
@@ -330,7 +330,7 @@
1, GTK_TYPE_POINTER);
combo_signals[POPWIN_HIDDEN] =
- gtk_signal_new ("popwin_hidden",
+ gtk_signal_new ("popwin-hidden",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdComboClass, popwin_hidden),
@@ -400,7 +400,7 @@
event_box = gtk_event_box_new ();
gtk_widget_ref (event_box);
- gtk_object_set_data_full (GTK_OBJECT (combo),"event_box", event_box, (GtkDestroyNotify) gtk_widget_unref);
+ gtk_object_set_data_full (GTK_OBJECT (combo), "event_box", event_box, (GtkDestroyNotify) gtk_widget_unref);
gtk_container_add (GTK_CONTAINER (combo->popwin), event_box);
gtk_widget_show (event_box);
gtk_widget_realize (event_box);
@@ -418,7 +418,7 @@
combo->popup = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_ref (combo->popup);
- gtk_object_set_data_full (GTK_OBJECT (combo),"combo->popup", combo->popup, (GtkDestroyNotify) gtk_widget_unref);
+ gtk_object_set_data_full (GTK_OBJECT (combo), "combo->popup", combo->popup, (GtkDestroyNotify) gtk_widget_unref);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (combo->popup), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (combo->popup)->hscrollbar, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (GTK_SCROLLED_WINDOW (combo->popup)->vscrollbar, GTK_CAN_FOCUS);
Modified: trunk/src/gnome-cmd-con-device.cc
==============================================================================
--- trunk/src/gnome-cmd-con-device.cc (original)
+++ trunk/src/gnome-cmd-con-device.cc Wed Aug 27 20:59:35 2008
@@ -193,9 +193,9 @@
{
GtkWidget *msgbox;
- DEBUG('m',"VFS Umount Callback: %s %s %s\n", succeeded ? "Succeeded" : "Failed",
- error ? error : "",
- detailed_error ? detailed_error : "");
+ DEBUG('m', "VFS Umount Callback: %s %s %s\n", succeeded ? "Succeeded" : "Failed",
+ error ? error : "",
+ detailed_error ? detailed_error : "");
if (succeeded)
{
@@ -242,7 +242,7 @@
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
@@ -416,7 +416,7 @@
dev->priv->alias = g_strdup (alias);
GNOME_CMD_CON (dev)->alias = g_strdup (alias);
- GNOME_CMD_CON (dev)->go_text = g_strdup_printf (_("Go to: %s (%s)"), alias,dev->priv->mountp);
+ GNOME_CMD_CON (dev)->go_text = g_strdup_printf (_("Go to: %s (%s)"), alias, dev->priv->mountp);
GNOME_CMD_CON (dev)->open_text = g_strdup_printf (_("Mount: %s"), alias);
GNOME_CMD_CON (dev)->close_text = g_strdup_printf (_("Unmount: %s"), alias);
}
Modified: trunk/src/gnome-cmd-con-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-con-dialog.cc (original)
+++ trunk/src/gnome-cmd-con-dialog.cc Wed Aug 27 20:59:35 2008
@@ -435,7 +435,7 @@
if (new_text_length != 1 || !g_ascii_isdigit (new_text[0]))
{
gdk_display_beep (gtk_widget_get_display (GTK_WIDGET (editable)));
- g_signal_stop_emission_by_name (editable, "insert_text");
+ g_signal_stop_emission_by_name (editable, "insert-text");
}
}
@@ -519,7 +519,7 @@
gtk_widget_show (table);
gtk_container_add (GTK_CONTAINER (align), table);
- g_signal_connect (dialog->priv->port_entry, "insert_text", G_CALLBACK (port_insert_text), NULL);
+ g_signal_connect (dialog->priv->port_entry, "insert-text", G_CALLBACK (port_insert_text), NULL);
setup_for_type (dialog);
Modified: trunk/src/gnome-cmd-con-list.cc
==============================================================================
--- trunk/src/gnome-cmd-con-list.cc (original)
+++ trunk/src/gnome-cmd-con-list.cc Wed Aug 27 20:59:35 2008
@@ -100,7 +100,7 @@
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
parent_class = (GtkObjectClass *) gtk_type_class (gtk_object_get_type ());
- con_list_signals[LIST_CHANGED] = gtk_signal_new ("list_changed",
+ con_list_signals[LIST_CHANGED] = gtk_signal_new ("list-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdConListClass, list_changed),
@@ -108,7 +108,7 @@
GTK_TYPE_NONE,
0);
- con_list_signals[FTP_LIST_CHANGED] = gtk_signal_new ("ftp_list_changed",
+ con_list_signals[FTP_LIST_CHANGED] = gtk_signal_new ("ftp-list-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdConListClass, ftp_list_changed),
@@ -116,7 +116,7 @@
GTK_TYPE_NONE,
0);
- con_list_signals[DEVICE_LIST_CHANGED] = gtk_signal_new ("device_list_changed",
+ con_list_signals[DEVICE_LIST_CHANGED] = gtk_signal_new ("device-list-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdConListClass, device_list_changed),
@@ -124,7 +124,7 @@
GTK_TYPE_NONE,
0);
- con_list_signals[QUICK_FTP_LIST_CHANGED] = gtk_signal_new ("quick_ftp_list_changed",
+ con_list_signals[QUICK_FTP_LIST_CHANGED] = gtk_signal_new ("quick-ftp-list-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdConListClass, quick_ftp_list_changed),
Modified: trunk/src/gnome-cmd-con.cc
==============================================================================
--- trunk/src/gnome-cmd-con.cc (original)
+++ trunk/src/gnome-cmd-con.cc Wed Aug 27 20:59:35 2008
@@ -137,7 +137,7 @@
0);
signals[OPEN_DONE] =
- gtk_signal_new ("open_done",
+ gtk_signal_new ("open-done",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdConClass, open_done),
@@ -146,7 +146,7 @@
0);
signals[OPEN_FAILED] =
- gtk_signal_new ("open_failed",
+ gtk_signal_new ("open-failed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdConClass, open_failed),
Modified: trunk/src/gnome-cmd-data.cc
==============================================================================
--- trunk/src/gnome-cmd-data.cc (original)
+++ trunk/src/gnome-cmd-data.cc Wed Aug 27 20:59:35 2008
@@ -509,7 +509,7 @@
gchar *device_fn = (gchar *) gnome_cmd_con_device_get_device_fn (device);
const gchar *mountp = gnome_cmd_con_device_get_mountp (device);
- if ((strcmp(device_fn, path)==0) && (strcmp(mountp,localpath)==0))
+ if ((strcmp(device_fn, path)==0) && (strcmp(mountp, localpath)==0))
{
DEBUG('m',"Remove Volume:\ndevice_fn = %s\tmountp = %s\n",
device_fn,mountp);
@@ -594,7 +594,7 @@
GnomeCmdConDevice *ConDev = gnome_cmd_con_device_new (name, path?path:NULL, localpath, iconpath);
gnome_cmd_con_device_set_autovol (ConDev, TRUE);
gnome_cmd_con_device_set_vfs_volume (ConDev, volume);
- gnome_cmd_con_list_add_device (data->priv->con_list,ConDev);
+ gnome_cmd_con_list_add_device (data->priv->con_list, ConDev);
}
else
DEBUG('m', "Device for mountpoint(%s) already exists. AutoVolume not added\n", localpath);
@@ -631,11 +631,11 @@
DEBUG('m',"name = %s\tpath = %s\turi = %s\tlocal = %s\n",name,path,uri,localpath);
- GnomeCmdConDevice *ConDev = gnome_cmd_con_device_new (name,path,localpath, icon);
+ GnomeCmdConDevice *ConDev = gnome_cmd_con_device_new (name, path, localpath, icon);
gnome_cmd_con_device_set_autovol (ConDev, TRUE);
- gnome_cmd_con_list_add_device (data->priv->con_list,ConDev);
+ gnome_cmd_con_list_add_device (data->priv->con_list, ConDev);
g_free (path);
g_free (uri);
@@ -674,11 +674,11 @@
{
monitor = gnome_vfs_get_volume_monitor ();
- g_signal_connect (monitor, "volume_mounted", G_CALLBACK (volume_mounted), NULL);
- g_signal_connect (monitor, "volume_unmounted", G_CALLBACK (volume_unmounted), NULL);
+ g_signal_connect (monitor, "volume-mounted", G_CALLBACK (volume_mounted), NULL);
+ g_signal_connect (monitor, "volume-unmounted", G_CALLBACK (volume_unmounted), NULL);
#if 0
- g_signal_connect (monitor, "drive_connected", G_CALLBACK (drive_connected), NULL);
- g_signal_connect (monitor, "drive_disconnected", G_CALLBACK (drive_disconnected), NULL);
+ g_signal_connect (monitor, "drive-connected", G_CALLBACK (drive_connected), NULL);
+ g_signal_connect (monitor, "drive-disconnected", G_CALLBACK (drive_disconnected), NULL);
#endif
}
@@ -842,15 +842,15 @@
inline void save_search_defaults ()
{
- gnome_cmd_data_set_int ("/search-history/width",data->priv->search_defaults->width);
- gnome_cmd_data_set_int ("/search-history/height",data->priv->search_defaults->height);
+ gnome_cmd_data_set_int ("/search-history/width", data->priv->search_defaults->width);
+ gnome_cmd_data_set_int ("/search-history/height", data->priv->search_defaults->height);
- gnome_cmd_data_set_string_history ("/search-history/name_pattern%d",data->priv->search_defaults->name_patterns);
- gnome_cmd_data_set_string_history ("/search-history/content_pattern%d",data->priv->search_defaults->content_patterns);
- gnome_cmd_data_set_string_history ("/search-history/directory%d",data->priv->search_defaults->directories);
+ gnome_cmd_data_set_string_history ("/search-history/name_pattern%d", data->priv->search_defaults->name_patterns);
+ gnome_cmd_data_set_string_history ("/search-history/content_pattern%d", data->priv->search_defaults->content_patterns);
+ gnome_cmd_data_set_string_history ("/search-history/directory%d", data->priv->search_defaults->directories);
- gnome_cmd_data_set_bool ("/search-history/recursive",data->priv->search_defaults->recursive);
- gnome_cmd_data_set_bool ("/search-history/case_sens",data->priv->search_defaults->case_sens);
+ gnome_cmd_data_set_bool ("/search-history/recursive", data->priv->search_defaults->recursive);
+ gnome_cmd_data_set_bool ("/search-history/case_sens", data->priv->search_defaults->case_sens);
}
@@ -884,7 +884,7 @@
gnome_cmd_data_set_int ("/advrename/counter_precision", data->priv->advrename_defaults->counter_precision);
gnome_cmd_data_set_int ("/advrename/counter_increment", data->priv->advrename_defaults->counter_increment);
- gnome_cmd_data_set_int ("/rename-history/size",g_list_length (data->priv->advrename_defaults->patterns));
+ gnome_cmd_data_set_int ("/rename-history/size", g_list_length (data->priv->advrename_defaults->patterns));
gnome_cmd_data_set_string_history ("/rename-history/from%d", from);
gnome_cmd_data_set_string_history ("/rename-history/to%d", to);
gnome_cmd_data_set_string_history ("/rename-history/csens%d", csens);
@@ -944,8 +944,8 @@
inline void save_auto_load_plugins ()
{
- gnome_cmd_data_set_int ("/plugins/count",g_list_length (data->priv->auto_load_plugins));
- gnome_cmd_data_set_string_history ("/plugins/auto_load%d",data->priv->auto_load_plugins);
+ gnome_cmd_data_set_int ("/plugins/count", g_list_length (data->priv->auto_load_plugins));
+ gnome_cmd_data_set_string_history ("/plugins/auto_load%d", data->priv->auto_load_plugins);
}
@@ -1221,7 +1221,7 @@
gnome_cmd_data_set_bool ("/programs/toolbar_visibility", data->priv->toolbar_visibility);
gnome_cmd_data_set_bool ("/programs/buttonbar_visibility", data->priv->buttonbar_visibility);
- if (data->priv->symlink_prefix && *data->priv->symlink_prefix && strcmp(data->priv->symlink_prefix,_("link to %s"))!=0)
+ if (data->priv->symlink_prefix && *data->priv->symlink_prefix && strcmp(data->priv->symlink_prefix, _("link to %s"))!=0)
gnome_cmd_data_set_string ("/options/symlink_prefix", data->priv->symlink_prefix);
else
gnome_cmd_data_set_string ("/options/symlink_prefix", "");
@@ -1234,16 +1234,16 @@
gnome_cmd_data_set_int ("/options/sort_column_right", data->priv->sort_column[RIGHT]);
gnome_cmd_data_set_bool ("/options/sort_direction_right", data->priv->sort_direction[RIGHT]);
- gnome_cmd_data_set_string ("/programs/viewer",data->priv->viewer);
- gnome_cmd_data_set_string ("/programs/editor",data->priv->editor);
- gnome_cmd_data_set_string ("/programs/differ",data->priv->differ);
- gnome_cmd_data_set_string ("/programs/terminal",data->priv->term);
-
- gnome_cmd_data_set_bool ("/programs/use_gcmd_block",data->priv->use_gcmd_block);
-
- gnome_cmd_data_set_bool ("/devices/only_icon",data->priv->device_only_icon);
- gnome_cmd_data_set_int ("/options/dir_cache_size",data->priv->dir_cache_size);
- gnome_cmd_data_set_bool ("/colors/use_ls_colors",data->priv->use_ls_colors);
+ gnome_cmd_data_set_string ("/programs/viewer", data->priv->viewer);
+ gnome_cmd_data_set_string ("/programs/editor", data->priv->editor);
+ gnome_cmd_data_set_string ("/programs/differ", data->priv->differ);
+ gnome_cmd_data_set_string ("/programs/terminal", data->priv->term);
+
+ gnome_cmd_data_set_bool ("/programs/use_gcmd_block", data->priv->use_gcmd_block);
+
+ gnome_cmd_data_set_bool ("/devices/only_icon", data->priv->device_only_icon);
+ gnome_cmd_data_set_int ("/options/dir_cache_size", data->priv->dir_cache_size);
+ gnome_cmd_data_set_bool ("/colors/use_ls_colors", data->priv->use_ls_colors);
const gchar *quick_connect_uri = gnome_cmd_con_get_uri (GNOME_CMD_CON (data->priv->quick_connect));
@@ -1422,7 +1422,7 @@
data->priv->list_font = gnome_cmd_data_get_string ("/options/list_font", "-misc-fixed-medium-r-normal-*-10-*-*-*-c-*-iso8859-1");
data->priv->ext_disp_mode = (GnomeCmdExtDispMode) gnome_cmd_data_get_int ("/options/ext_disp_mode", GNOME_CMD_EXT_DISP_BOTH);
- data->priv->right_mouse_button_mode = (GnomeCmdRightMouseButtonMode) gnome_cmd_data_get_int ("/options/right_mouse_button_mode",RIGHT_BUTTON_POPUPS_MENU);
+ data->priv->right_mouse_button_mode = (GnomeCmdRightMouseButtonMode) gnome_cmd_data_get_int ("/options/right_mouse_button_mode", RIGHT_BUTTON_POPUPS_MENU);
data->priv->show_toolbar = gnome_cmd_data_get_bool ("/options/show_toolbar", TRUE);
data->priv->icon_size = gnome_cmd_data_get_int ("/options/icon_size", 16);
data->priv->dev_icon_size = gnome_cmd_data_get_int ("/options/dev_icon_size", 16);
Modified: trunk/src/gnome-cmd-data.h
==============================================================================
--- trunk/src/gnome-cmd-data.h (original)
+++ trunk/src/gnome-cmd-data.h Wed Aug 27 20:59:35 2008
@@ -52,7 +52,7 @@
GList *directories;
gboolean recursive;
gboolean case_sens;
- gint width,height;
+ gint width, height;
} SearchDefaults;
typedef struct
@@ -63,7 +63,7 @@
guint counter_precision;
guint counter_increment;
gboolean auto_update;
- gint width,height;
+ gint width, height;
gint pat_col_widths;
gint res_col_widths;
gint sep_value;
Modified: trunk/src/gnome-cmd-dir-indicator.cc
==============================================================================
--- trunk/src/gnome-cmd-dir-indicator.cc (original)
+++ trunk/src/gnome-cmd-dir-indicator.cc Wed Aug 27 20:59:35 2008
@@ -429,9 +429,9 @@
// create the directory label and its event box
indicator->priv->event_box = gtk_event_box_new ();
gtk_widget_ref (indicator->priv->event_box);
- gtk_signal_connect_object (GTK_OBJECT (indicator->priv->event_box), "motion_notify_event",
+ gtk_signal_connect_object (GTK_OBJECT (indicator->priv->event_box), "motion-notify-event",
GTK_SIGNAL_FUNC (on_dir_indicator_motion), indicator);
- gtk_signal_connect_object (GTK_OBJECT (indicator->priv->event_box), "leave_notify_event",
+ gtk_signal_connect_object (GTK_OBJECT (indicator->priv->event_box), "leave-notify-event",
GTK_SIGNAL_FUNC (on_dir_indicator_leave), indicator);
gtk_widget_set_events (indicator->priv->event_box, GDK_POINTER_MOTION_MASK);
@@ -508,7 +508,7 @@
{
GnomeCmdDirIndicator *dir_indicator = (GnomeCmdDirIndicator *) gtk_type_new (gnome_cmd_dir_indicator_get_type ());
- gtk_signal_connect (GTK_OBJECT (dir_indicator), "button_press_event", G_CALLBACK (on_dir_indicator_clicked), fs);
+ gtk_signal_connect (GTK_OBJECT (dir_indicator), "button-press-event", G_CALLBACK (on_dir_indicator_clicked), fs);
dir_indicator->priv->fs = fs;
@@ -532,7 +532,7 @@
if (!path)
return;
- gboolean isUNC = g_str_has_prefix(path,"\\\\");
+ gboolean isUNC = g_str_has_prefix (path, "\\\\");
if (!isUNC && *path!=G_DIR_SEPARATOR)
return;
Modified: trunk/src/gnome-cmd-file-list.cc
==============================================================================
--- trunk/src/gnome-cmd-file-list.cc (original)
+++ trunk/src/gnome-cmd-file-list.cc Wed Aug 27 20:59:35 2008
@@ -501,7 +501,7 @@
for (gint i=GnomeCmdFileList::COLUMN_NAME; i<GnomeCmdFileList::NUM_COLUMNS; i++)
{
- GtkWidget *hbox,*pixmap;
+ GtkWidget *hbox, *pixmap;
GdkPixmap *pm = IMAGE_get_pixmap (PIXMAP_FLIST_ARROW_BLANK);
GdkBitmap *bm = IMAGE_get_mask (PIXMAP_FLIST_ARROW_BLANK);
@@ -681,7 +681,7 @@
drag_types, G_N_ELEMENTS (drag_types),
(GdkDragAction) (GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_ASK | GDK_ACTION_DEFAULT));
- gtk_signal_connect (*fl, "drag_data_get", GTK_SIGNAL_FUNC (drag_data_get), fl);
+ gtk_signal_connect (*fl, "drag-data-get", GTK_SIGNAL_FUNC (drag_data_get), fl);
}
@@ -1241,7 +1241,7 @@
parent_class = (GnomeCmdCListClass *) gtk_type_class (gnome_cmd_clist_get_type ());
file_list_signals[FILE_CLICKED] =
- gtk_signal_new ("file_clicked",
+ gtk_signal_new ("file-clicked",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdFileListClass, file_clicked),
@@ -1250,7 +1250,7 @@
2, GTK_TYPE_POINTER, GTK_TYPE_POINTER);
file_list_signals[LIST_CLICKED] =
- gtk_signal_new ("list_clicked",
+ gtk_signal_new ("list-clicked",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdFileListClass, list_clicked),
@@ -1260,7 +1260,7 @@
GTK_TYPE_POINTER);
file_list_signals[EMPTY_SPACE_CLICKED] =
- gtk_signal_new ("empty_space_clicked",
+ gtk_signal_new ("empty-space-clicked",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdFileListClass, empty_space_clicked),
@@ -1269,7 +1269,7 @@
1, GTK_TYPE_POINTER);
file_list_signals[SELECTION_CHANGED] =
- gtk_signal_new ("selection_changed",
+ gtk_signal_new ("selection-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdFileListClass, selection_changed),
@@ -2118,9 +2118,9 @@
gboolean gnome_cmd_file_list_quicksearch_shown (GnomeCmdFileList *fl)
{
- g_return_val_if_fail (fl!=NULL,FALSE);
- g_return_val_if_fail (GNOME_CMD_IS_FILE_LIST (fl),FALSE);
- g_return_val_if_fail (fl->priv!=NULL,FALSE);
+ g_return_val_if_fail (fl!=NULL, FALSE);
+ g_return_val_if_fail (GNOME_CMD_IS_FILE_LIST (fl), FALSE);
+ g_return_val_if_fail (fl->priv!=NULL, FALSE);
return fl->priv->quicksearch_popup!=NULL;
}
Modified: trunk/src/gnome-cmd-file-list.h
==============================================================================
--- trunk/src/gnome-cmd-file-list.h (original)
+++ trunk/src/gnome-cmd-file-list.h Wed Aug 27 20:59:35 2008
@@ -169,7 +169,6 @@
GnomeCmdFile *gnome_cmd_file_list_get_file_at_row (GnomeCmdFileList *fl, gint row);
gint gnome_cmd_file_list_get_row_from_file (GnomeCmdFileList *fl, GnomeCmdFile *finfo);
-
void gnome_cmd_file_list_show_advrename_dialog (GnomeCmdFileList *fl);
void gnome_cmd_file_list_show_chmod_dialog (GnomeCmdFileList *fl);
void gnome_cmd_file_list_show_chown_dialog (GnomeCmdFileList *fl);
Modified: trunk/src/gnome-cmd-file-selector.cc
==============================================================================
--- trunk/src/gnome-cmd-file-selector.cc (original)
+++ trunk/src/gnome-cmd-file-selector.cc Wed Aug 27 20:59:35 2008
@@ -1266,7 +1266,7 @@
parent_class = (GtkVBoxClass *) gtk_type_class (gtk_vbox_get_type ());
file_selector_signals[CHANGED_DIR] =
- gtk_signal_new ("changed_dir",
+ gtk_signal_new ("changed-dir",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdFileSelectorClass, changed_dir),
@@ -1384,7 +1384,7 @@
GTK_SIGNAL_FUNC (on_list_list_clicked), fs);
gtk_signal_connect (GTK_OBJECT (fs->file_list()), "empty-space-clicked",
GTK_SIGNAL_FUNC (on_list_empty_space_clicked), fs);
- gtk_signal_connect (GTK_OBJECT (fs->file_list()), "selection_changed",
+ gtk_signal_connect (GTK_OBJECT (fs->file_list()), "selection-changed",
GTK_SIGNAL_FUNC (on_list_selection_changed), fs);
gtk_signal_connect (GTK_OBJECT (fs->file_list()), "key-press-event",
Modified: trunk/src/gnome-cmd-file.cc
==============================================================================
--- trunk/src/gnome-cmd-file.cc (original)
+++ trunk/src/gnome-cmd-file.cc Wed Aug 27 20:59:35 2008
@@ -716,7 +716,7 @@
static void on_file_downloaded_for_view (gchar *path)
{
- do_view_file (path,-1);
+ do_view_file (path, -1);
g_free (path);
}
Modified: trunk/src/gnome-cmd-main-win.cc
==============================================================================
--- trunk/src/gnome-cmd-main-win.cc (original)
+++ trunk/src/gnome-cmd-main-win.cc Wed Aug 27 20:59:35 2008
@@ -726,7 +726,7 @@
parent_class = (GnomeAppClass *) gtk_type_class (gnome_app_get_type ());
main_win_signals[SWITCH_FS] =
- gtk_signal_new ("switch_fs",
+ gtk_signal_new ("switch-fs",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GnomeCmdMainWinClass, switch_fs),
@@ -817,18 +817,18 @@
gtk_signal_connect (GTK_OBJECT (mw->priv->file_selector[RIGHT]), "changed-dir", GTK_SIGNAL_FUNC (on_fs_dir_change), mw);
gtk_signal_connect (GTK_OBJECT (GNOME_CMD_FILE_SELECTOR (mw->priv->file_selector[LEFT])->file_list()),
- "resize_column", GTK_SIGNAL_FUNC (on_fs_list_resize_column),
+ "resize-column", GTK_SIGNAL_FUNC (on_fs_list_resize_column),
GNOME_CMD_FILE_SELECTOR (mw->priv->file_selector[RIGHT])->file_list());
gtk_signal_connect (GTK_OBJECT (GNOME_CMD_FILE_SELECTOR (mw->priv->file_selector[RIGHT])->file_list()),
- "resize_column", GTK_SIGNAL_FUNC (on_fs_list_resize_column),
+ "resize-column", GTK_SIGNAL_FUNC (on_fs_list_resize_column),
GNOME_CMD_FILE_SELECTOR (mw->priv->file_selector[LEFT])->file_list());
gtk_signal_connect (GTK_OBJECT (GNOME_CMD_FILE_SELECTOR (mw->priv->file_selector[LEFT])->file_list()),
- "button_press_event", GTK_SIGNAL_FUNC (on_left_fs_select), mw);
+ "button-press-event", GTK_SIGNAL_FUNC (on_left_fs_select), mw);
gtk_signal_connect (GTK_OBJECT (GNOME_CMD_FILE_SELECTOR (mw->priv->file_selector[RIGHT])->file_list()),
- "button_press_event", GTK_SIGNAL_FUNC (on_right_fs_select), mw);
+ "button-press-event", GTK_SIGNAL_FUNC (on_right_fs_select), mw);
gtk_signal_connect (GTK_OBJECT (mw), "size-allocate", GTK_SIGNAL_FUNC (on_size_allocate), mw);
gtk_signal_connect (GTK_OBJECT (mw), "delete-event", GTK_SIGNAL_FUNC (on_delete_event), mw);
- gtk_signal_connect (GTK_OBJECT (mw->priv->paned), "button_press_event", GTK_SIGNAL_FUNC (on_slide_button_press), mw);
+ gtk_signal_connect (GTK_OBJECT (mw->priv->paned), "button-press-event", GTK_SIGNAL_FUNC (on_slide_button_press), mw);
g_signal_connect (mw, "window-state-event", GTK_SIGNAL_FUNC (on_window_state_event), NULL);
gnome_cmd_file_selector_update_connections (gnome_cmd_main_win_get_fs (mw, LEFT));
@@ -1285,7 +1285,7 @@
gtk_widget_unref (mw->priv->file_selector[LEFT]);
gtk_widget_unref (mw->priv->file_selector[RIGHT]);
- gtk_signal_connect (GTK_OBJECT (mw->priv->paned), "button_press_event", GTK_SIGNAL_FUNC (on_slide_button_press), mw);
+ gtk_signal_connect (GTK_OBJECT (mw->priv->paned), "button-press-event", GTK_SIGNAL_FUNC (on_slide_button_press), mw);
slide_set_50_50 (NULL, NULL);
}
Modified: trunk/src/gnome-cmd-options-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-options-dialog.cc (original)
+++ trunk/src/gnome-cmd-options-dialog.cc Wed Aug 27 20:59:35 2008
@@ -261,7 +261,7 @@
label = create_label (parent, "");
gtk_object_set_data_full (GTK_OBJECT (parent), "date_format_test_label",
label, (GtkDestroyNotify) gtk_widget_unref);
- gtk_signal_connect (GTK_OBJECT (label), "realize",GTK_SIGNAL_FUNC (on_date_format_update), parent);
+ gtk_signal_connect (GTK_OBJECT (label), "realize", GTK_SIGNAL_FUNC (on_date_format_update), parent);
table_add (table, label, 1, 1, (GtkAttachOptions) (GTK_EXPAND|GTK_FILL));
label = create_label (parent, _("See the manual page for \"strftime\" for help on how to set the format string."));
@@ -520,7 +520,7 @@
// LS_COLORS
check = create_check (parent, _("Colorize files according to the LS_COLORS environment variable"), "use_ls_colors");
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),gnome_cmd_data_get_use_ls_colors());
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gnome_cmd_data_get_use_ls_colors());
gtk_table_attach (GTK_TABLE (table), check, 0, 2, 5, 6, GTK_FILL, GTK_FILL, 0, 0);
@@ -1530,7 +1530,7 @@
if (dev) s = gnome_cmd_con_device_get_icon_path (dev);
entry = create_icon_entry (dialog, "device_iconentry", s);
- icon_dir = g_build_path (G_DIR_SEPARATOR_S,PIXMAPS_DIR, "device-icons", NULL);
+ icon_dir = g_build_path (G_DIR_SEPARATOR_S, PIXMAPS_DIR, "device-icons", NULL);
gnome_icon_entry_set_pixmap_subdir (GNOME_ICON_ENTRY (entry), icon_dir);
g_free (icon_dir);
table_add (table, entry, 1, 3, GTK_FILL);
Modified: trunk/src/intviewer/image-render.cc
==============================================================================
--- trunk/src/intviewer/image-render.cc (original)
+++ trunk/src/intviewer/image-render.cc Wed Aug 27 20:59:35 2008
@@ -223,7 +223,7 @@
widget_class->realize = image_render_realize;
image_render_signals[IMAGE_STATUS_CHANGED] =
- gtk_signal_new ("image_status_changed",
+ gtk_signal_new ("image-status-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (ImageRenderClass, image_status_changed),
Modified: trunk/src/intviewer/text-render.cc
==============================================================================
--- trunk/src/intviewer/text-render.cc (original)
+++ trunk/src/intviewer/text-render.cc Wed Aug 27 20:59:35 2008
@@ -276,7 +276,7 @@
widget_class->realize = text_render_realize;
text_render_signals[TEXT_STATUS_CHANGED] =
- gtk_signal_new ("text_status_changed",
+ gtk_signal_new ("text-status-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (TextRenderClass, text_status_changed),
@@ -321,7 +321,7 @@
w->priv->fixed_font_name = g_strdup ("Monospace");
- g_signal_connect(G_OBJECT (w), "key_press_event", G_CALLBACK (text_render_key_pressed), NULL);
+ g_signal_connect(G_OBJECT (w), "key-press-event", G_CALLBACK (text_render_key_pressed), NULL);
w->priv->layout = gtk_widget_create_pango_layout(GTK_WIDGET (w), NULL);
Modified: trunk/src/intviewer/viewer-widget.cc
==============================================================================
--- trunk/src/intviewer/viewer-widget.cc (original)
+++ trunk/src/intviewer/viewer-widget.cc Wed Aug 27 20:59:35 2008
@@ -133,7 +133,7 @@
object_class->destroy = gviewer_destroy;
gviewer_signals[STATUS_LINE_CHANGED] =
- gtk_signal_new ("status_line_changed",
+ gtk_signal_new ("status-line-changed",
GTK_RUN_LAST,
G_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GViewerClass, status_line_changed),
@@ -189,8 +189,8 @@
g_signal_connect (G_OBJECT (w), "destroy-event", G_CALLBACK (gviewer_destroy), (gpointer) w);
- g_signal_connect (G_OBJECT (w->priv->textr), "text_status_changed", G_CALLBACK (gviewer_text_status_update), (gpointer) w);
- g_signal_connect (G_OBJECT (w->priv->imgr), "image_status_changed", G_CALLBACK (gviewer_image_status_update), (gpointer) w);
+ g_signal_connect (G_OBJECT (w->priv->textr), "text-status-changed", G_CALLBACK (gviewer_text_status_update), (gpointer) w);
+ g_signal_connect (G_OBJECT (w->priv->imgr), "image-status-changed", G_CALLBACK (gviewer_image_status_update), (gpointer) w);
}
Modified: trunk/src/intviewer/viewer-window.cc
==============================================================================
--- trunk/src/intviewer/viewer-window.cc (original)
+++ trunk/src/intviewer/viewer-window.cc Wed Aug 27 20:59:35 2008
@@ -292,7 +292,7 @@
GtkWindow *win = GTK_WINDOW (w);
gtk_window_set_title(win, "GViewer");
- g_signal_connect(G_OBJECT (w), "key_press_event", G_CALLBACK (gviewer_window_key_pressed), NULL);
+ g_signal_connect(G_OBJECT (w), "key-press-event", G_CALLBACK (gviewer_window_key_pressed), NULL);
w->priv->vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_show (w->priv->vbox);
@@ -308,7 +308,7 @@
w->priv->exif_viewer = (GViewer *) gviewer_new();
g_object_ref (G_OBJECT (w->priv->exif_viewer));
- g_signal_connect(G_OBJECT (w->priv->viewer), "status_line_changed", G_CALLBACK (gviewer_window_status_line_changed), (gpointer) w);
+ g_signal_connect(G_OBJECT (w->priv->viewer), "status-line-changed", G_CALLBACK (gviewer_window_status_line_changed), (gpointer) w);
w->priv->statusbar = gtk_statusbar_new ();
Modified: trunk/src/intviewer/viewer-window.h
==============================================================================
--- trunk/src/intviewer/viewer-window.h (original)
+++ trunk/src/intviewer/viewer-window.h Wed Aug 27 20:59:35 2008
@@ -76,7 +76,7 @@
void
gviewer_window_load_file (GViewerWindow *obj, const gchar *filename);
-GtkWidget *gviewer_window_file_view (const gchar * filename,GViewerWindowSettings *initial_settings);
+GtkWidget *gviewer_window_file_view (const gchar * filename, GViewerWindowSettings *initial_settings);
void gviewer_window_get_current_settings(GViewerWindow *obj, /* out */ GViewerWindowSettings *settings);
void gviewer_window_set_settings(GViewerWindow *obj, /*in*/ GViewerWindowSettings *settings);
Modified: trunk/src/owner.cc
==============================================================================
--- trunk/src/owner.cc (original)
+++ trunk/src/owner.cc Wed Aug 27 20:59:35 2008
@@ -45,7 +45,7 @@
{
if (pw)
{
- user_t *user = g_new0 (user_t,1);
+ user_t *user = g_new0 (user_t, 1);
g_assert (pw->pw_name);
g_assert (pw->pw_passwd);
@@ -79,7 +79,7 @@
g_assert (gr->gr_name);
g_assert (gr->gr_passwd);
- group = g_new0 (group_t,1);
+ group = g_new0 (group_t, 1);
group->zombie = zombie;
group->name = g_strdup (gr->gr_name);
@@ -211,13 +211,13 @@
struct passwd pw;
pw.pw_uid = uid;
- pw.pw_name = g_strdup_printf ("%d",uid);
+ pw.pw_name = g_strdup_printf ("%d", uid);
pw.pw_gecos = "";
pw.pw_dir = "";
pw.pw_shell = "";
pw.pw_passwd = "";
- user = create_user (&pw,TRUE);
+ user = create_user (&pw, TRUE);
if (user)
all_users = g_list_append (all_users, user);
@@ -257,11 +257,11 @@
struct group gr;
gr.gr_gid = gid;
- gr.gr_name = g_strdup_printf ("%d",gid);
+ gr.gr_name = g_strdup_printf ("%d", gid);
gr.gr_passwd = "";
gr.gr_mem = NULL;
- group_t *group = create_group (&gr,TRUE);
+ group_t *group = create_group (&gr, TRUE);
if (group)
all_groups = g_list_append (all_groups, group);
Modified: trunk/src/utils.cc
==============================================================================
--- trunk/src/utils.cc (original)
+++ trunk/src/utils.cc Wed Aug 27 20:59:35 2008
@@ -169,7 +169,7 @@
{
g_return_val_if_fail (GTK_IS_DIALOG (data), FALSE);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (data), "delete_event");
+ gtk_signal_emit_stop_by_name (GTK_OBJECT (data), "delete-event");
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
