9799N/Adiff -Nrup gnome-system-monitor-2.14.1/configure.in gnome-system-monitor-2.14.1.mod/configure.in

9799N/A--- gnome-system-monitor-2.14.1/configure.in 2006-04-10 01:39:27.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/configure.in 2006-06-23 17:17:39.797532000 +0800

9595N/A@@ -31,6 +31,12 @@ GNOME_VFS_REQUIRED=2.6.0

8405N/A LIBGKSUUI_REQUIRED=1.0.0

8405N/A LIBGKSU_REQUIRED=0.15.0

9595N/A

8405N/A+case "$host" in

8405N/A+*-*-solaris*) GMSGFMT_CHECKOPT= ;;

9370N/A+*) GMSGFMT_CHECKOPT=-c ;;

8405N/A+esac

8405N/A+AC_SUBST( GMSGFMT_CHECKOPT)

8405N/A+

8405N/A PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED)

8405N/A

8405N/A

8405N/Adiff -Nrup gnome-system-monitor-2.14.1/po/Makefile.in.in gnome-system-monitor-2.14.1.mod/po/Makefile.in.in

8405N/A--- gnome-system-monitor-2.14.1/po/Makefile.in.in 2006-04-10 19:51:06.000000000 +0800

8405N/A+++ gnome-system-monitor-2.14.1.mod/po/Makefile.in.in 2006-06-23 17:19:28.802301000 +0800

8405N/A@@ -48,6 +48,7 @@ INSTALL_DATA = @INSTALL_DATA@

8405N/A

8405N/A CC = @CC@

8405N/A GMSGFMT = @GMSGFMT@

8405N/A+GMSGFMT_CHECKOPT = @GMSGFMT_CHECKOPT@

8405N/A MSGFMT = @MSGFMT@

8405N/A XGETTEXT = @XGETTEXT@

8405N/A INTLTOOL_UPDATE = @INTLTOOL_UPDATE@

8405N/A@@ -90,7 +91,7 @@ CATOBJEXT = @CATOBJEXT@

8405N/A

8405N/A .po.gmo:

8405N/A file=`echo $* | sed 's,.*/,,'`.gmo \

8405N/A- && rm -f $$file && $(GMSGFMT) -o $$file $<

8405N/A+ && rm -f $$file && $(GMSGFMT) -o $(GMSGFMT_CHECKOPT) $$file $<

8405N/A

8405N/A .po.cat:

8405N/A sed -f ../intl/po2msg.sed < $< > $*.msg \

8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/callbacks.c gnome-system-monitor-2.14.1.mod/src/callbacks.c

8405N/A--- gnome-system-monitor-2.14.1/src/callbacks.c 2005-09-04 10:49:43.000000000 +0800

8405N/A+++ gnome-system-monitor-2.14.1.mod/src/callbacks.c 2006-07-19 18:47:13.274807000 +0800

8405N/A@@ -371,7 +371,6 @@ cb_change_current_page (GtkNotebook *nb,

8405N/A

8405N/A

8405N/A if (num == 0) {

8405N/A-

8405N/A cb_timeout (procdata);

8405N/A

8405N/A if (!procdata->timeout)

8405N/A@@ -450,7 +449,11 @@ cb_timeout (gpointer data)

9370N/A return FALSE;

9370N/A }

9370N/A

9370N/A- return TRUE;

9370N/A+ procdata->timeout = g_timeout_add(new_interval,

9370N/A+ cb_timeout,

9370N/A+ procdata);

9370N/A+

8405N/A+ return FALSE;

9370N/A }

9370N/A

8405N/A

9370N/Adiff -Nrup gnome-system-monitor-2.14.1/src/callbacks.h gnome-system-monitor-2.14.1.mod/src/callbacks.h

9370N/A--- gnome-system-monitor-2.14.1/src/callbacks.h 2005-07-13 22:35:04.000000000 +0800

8405N/A+++ gnome-system-monitor-2.14.1.mod/src/callbacks.h 2006-07-19 19:41:55.568027000 +0800

9370N/A@@ -25,64 +25,64 @@

9370N/A #include "procman.h"

8405N/A #include <libgnomevfs/gnome-vfs.h>

9370N/A

8405N/A-void cb_show_memory_maps (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-void cb_show_open_files (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-void cb_renice (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-void cb_end_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-void cb_kill_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-void cb_hide_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-void cb_show_hidden_processes (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-void cb_edit_preferences (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

8405N/A-

9370N/A-void cb_help_contents (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

8405N/A-void cb_about (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-

8405N/A-void cb_app_exit (GtkAction *action, gpointer data) G_GNUC_INTERNAL;

9370N/A-gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data) G_GNUC_INTERNAL;

8405N/A-

8405N/A-void cb_end_process_button_pressed (GtkButton *button, gpointer data) G_GNUC_INTERNAL;

8405N/A-void cb_logout (GtkButton *button, gpointer data) G_GNUC_INTERNAL;

9370N/A-

8405N/A-void cb_info_button_pressed (GtkButton *button, gpointer user_data) G_GNUC_INTERNAL;

9370N/A-

8405N/A-void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;

8405N/A-void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;

8405N/A-void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;

9370N/A-void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;

9799N/A-void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;

8405N/A-void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;

8405N/A-void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;

8405N/A-

8405N/A-void cb_row_selected (GtkTreeSelection *selection, gpointer data) G_GNUC_INTERNAL;

8405N/A-

9370N/A-gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data) G_GNUC_INTERNAL;

8405N/A-gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,

8405N/A- gpointer data) G_GNUC_INTERNAL;

8405N/A-

8405N/A-

8405N/A-void cb_change_current_page (GtkNotebook *nb,

9370N/A- gint num, gpointer data) G_GNUC_INTERNAL;

8405N/A-void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,

8405N/A- gint num, gpointer data) G_GNUC_INTERNAL;

8405N/A+G_GNUC_INTERNAL void cb_show_memory_maps (GtkAction *action, gpointer data);

8405N/A+G_GNUC_INTERNAL void cb_show_open_files (GtkAction *action, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_renice (GtkAction *action, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_end_process (GtkAction *action, gpointer data) ;

9370N/A+G_GNUC_INTERNAL void cb_kill_process (GtkAction *action, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_hide_process (GtkAction *action, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_show_hidden_processes (GtkAction *action, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_edit_preferences (GtkAction *action, gpointer data) ;

8405N/A+

9370N/A+G_GNUC_INTERNAL void cb_help_contents (GtkAction *action, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_about (GtkAction *action, gpointer data) ;

8405N/A+

9799N/A+G_GNUC_INTERNAL void cb_app_exit (GtkAction *action, gpointer data) ;

9799N/A+G_GNUC_INTERNAL gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data) ;

9799N/A+

8405N/A+G_GNUC_INTERNAL void cb_end_process_button_pressed (GtkButton *button, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_logout (GtkButton *button, gpointer data) ;

8405N/A+

8405N/A+G_GNUC_INTERNAL void cb_info_button_pressed (GtkButton *button, gpointer user_data) ;

8405N/A+

8405N/A+G_GNUC_INTERNAL void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data) ;

8405N/A+G_GNUC_INTERNAL void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data) ;

8405N/A+G_GNUC_INTERNAL void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data) ;

8405N/A+G_GNUC_INTERNAL void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data) ;

9595N/A+G_GNUC_INTERNAL void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data) ;

9595N/A+G_GNUC_INTERNAL void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data) ;

9595N/A+G_GNUC_INTERNAL void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data) ;

8405N/A+

8405N/A+G_GNUC_INTERNAL void cb_row_selected (GtkTreeSelection *selection, gpointer data) ;

9595N/A+

8405N/A+G_GNUC_INTERNAL gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data) ;

8405N/A+G_GNUC_INTERNAL gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,

9595N/A+ gpointer data) ;

8405N/A+

8405N/A+

9595N/A+G_GNUC_INTERNAL void cb_change_current_page (GtkNotebook *nb,

8405N/A+ gint num, gpointer data) ;

8405N/A+G_GNUC_INTERNAL void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,

9799N/A+ gint num, gpointer data) ;

9799N/A

9799N/A-gint cb_update_disks (gpointer data) G_GNUC_INTERNAL;

9799N/A-gint cb_timeout (gpointer data) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL gint cb_update_disks (gpointer data) ;

8922N/A+G_GNUC_INTERNAL gint cb_timeout (gpointer data) ;

8922N/A

8922N/A-void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,

8922N/A+G_GNUC_INTERNAL void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,

8922N/A GnomeVFSVolume *vol,

8922N/A- gpointer procdata) G_GNUC_INTERNAL;

8922N/A+ gpointer procdata) ;

8922N/A

8922N/A-void cb_radio_processes(GtkAction *action,

8922N/A+G_GNUC_INTERNAL void cb_radio_processes(GtkAction *action,

8922N/A GtkRadioAction *current,

8922N/A- gpointer data) G_GNUC_INTERNAL;

8922N/A+ gpointer data) ;

9799N/A

8922N/A

8922N/A

8922N/A-void cb_kill_sigstop(GtkAction *action,

8922N/A- gpointer data) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void cb_kill_sigstop(GtkAction *action,

8922N/A+ gpointer data) ;

8922N/A

9799N/A-void cb_kill_sigcont(GtkAction *action,

8922N/A- gpointer data) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void cb_kill_sigcont(GtkAction *action,

8922N/A+ gpointer data) ;

8922N/A

8922N/A

8922N/A #endif /* _PROCMAN_CALLBACKS_H_ */

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/favorites.h gnome-system-monitor-2.14.1.mod/src/favorites.h

8922N/A--- gnome-system-monitor-2.14.1/src/favorites.h 2005-03-17 17:23:13.000000000 +0800

8922N/A+++ gnome-system-monitor-2.14.1.mod/src/favorites.h 2006-07-19 19:43:15.233467000 +0800

8922N/A@@ -26,15 +26,15 @@

8922N/A

8922N/A #include "procman.h"

8922N/A

8922N/A-void save_blacklist (ProcData *procdata, GConfClient *client) G_GNUC_INTERNAL;

8922N/A-void add_to_blacklist (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;

8922N/A-void add_selected_to_blacklist (ProcData *procdata) G_GNUC_INTERNAL;

8922N/A-void remove_from_blacklist (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void save_blacklist (ProcData *procdata, GConfClient *client);

8922N/A+G_GNUC_INTERNAL void add_to_blacklist (ProcData *procdata, gchar *name) ;

8922N/A+G_GNUC_INTERNAL void add_selected_to_blacklist (ProcData *procdata) ;

8922N/A+G_GNUC_INTERNAL void remove_from_blacklist (ProcData *procdata, gchar *name) ;

9799N/A

8922N/A-gboolean is_process_blacklisted (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL gboolean is_process_blacklisted (ProcData *procdata, gchar *name) ;

9595N/A

8922N/A-void get_blacklist (ProcData *procdata, GConfClient *client) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void get_blacklist (ProcData *procdata, GConfClient *client) ;

8922N/A

9595N/A-void create_blacklist_dialog (ProcData *procdata) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void create_blacklist_dialog (ProcData *procdata) ;

8922N/A

9595N/A #endif

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/interface.h gnome-system-monitor-2.14.1.mod/src/interface.h

8922N/A--- gnome-system-monitor-2.14.1/src/interface.h 2005-03-17 22:23:42.000000000 +0800

9595N/A+++ gnome-system-monitor-2.14.1.mod/src/interface.h 2006-07-19 19:44:10.487576000 +0800

9595N/A@@ -25,9 +25,9 @@

8922N/A #include "procman.h"

9595N/A

8922N/A

8922N/A-void create_main_window (ProcData *data) G_GNUC_INTERNAL;

8922N/A-void update_sensitivity (ProcData *data, gboolean sensitivity) G_GNUC_INTERNAL;

8922N/A-void do_popup_menu(ProcData *data, GdkEventButton *event) G_GNUC_INTERNAL;

8922N/A-GtkWidget * make_title_label (const char *text) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void create_main_window (ProcData *data) ;

9595N/A+G_GNUC_INTERNAL void update_sensitivity (ProcData *data, gboolean sensitivity) ;

9595N/A+G_GNUC_INTERNAL void do_popup_menu(ProcData *data, GdkEventButton *event) ;

8922N/A+G_GNUC_INTERNAL GtkWidget * make_title_label (const char *text) ;

9595N/A

8922N/A #endif /* _PROCMAN_INTERFACE_H_ */

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/load-graph.c gnome-system-monitor-2.14.1.mod/src/load-graph.c

8922N/A--- gnome-system-monitor-2.14.1/src/load-graph.c 2006-04-10 00:46:29.000000000 +0800

8922N/A+++ gnome-system-monitor-2.14.1.mod/src/load-graph.c 2006-07-07 14:16:03.034343000 +0800

9595N/A@@ -26,6 +26,10 @@

8922N/A

8922N/A #define NUM_POINTS 100

8922N/A #define GRAPH_MIN_HEIGHT 30

8922N/A+/*static const unsigned needed_netload_flags =

9799N/A+(1 << GLIBTOP_NETLOAD_IF_FLAGS) +

8922N/A+(1 << GLIBTOP_NETLOAD_BYTES_TOTAL);

8922N/A+*/

8922N/A

8922N/A

8922N/A enum {

9595N/A@@ -71,7 +75,7 @@ struct _LoadGraph {

8922N/A GTimeVal time;

8922N/A float max;

9595N/A } net;

9595N/A- };

8922N/A+ }category;

9596N/A };

8922N/A

8922N/A

8922N/A@@ -206,8 +210,8 @@ get_load (LoadGraph *g)

8922N/A

8922N/A #undef NOW

8922N/A #undef LAST

9595N/A-#define NOW (g->cpu.times[g->cpu.now])

9595N/A-#define LAST (g->cpu.times[g->cpu.now ^ 1])

9595N/A+#define NOW (g->category.cpu.times[g->category.cpu.now])

8922N/A+#define LAST (g->category.cpu.times[g->category.cpu.now ^ 1])

8922N/A

8922N/A if (g->n == 1) {

8922N/A NOW[0][CPU_TOTAL] = cpu.total;

9799N/A@@ -220,9 +224,9 @@ get_load (LoadGraph *g)

9799N/A }

9799N/A }

9799N/A

9799N/A- if (G_UNLIKELY(!g->cpu.initialized)) {

9799N/A+ if (G_UNLIKELY(!g->category.cpu.initialized)) {

9799N/A /* No data yet */

9799N/A- g->cpu.initialized = TRUE;

8922N/A+ g->category.cpu.initialized = TRUE;

8922N/A } else {

8922N/A for (i = 0; i < g->n; i++) {

8922N/A float load;

8922N/A@@ -242,7 +246,7 @@ get_load (LoadGraph *g)

8922N/A }

8922N/A }

8922N/A

8922N/A- g->cpu.now ^= 1;

8922N/A+ g->category.cpu.now ^= 1;

8922N/A

8922N/A #undef NOW

8922N/A #undef LAST

8922N/A@@ -293,7 +297,7 @@ static void

8922N/A net_scale (LoadGraph *g, float new_max)

8922N/A {

8922N/A gint i;

8922N/A- float old_max = MAX (g->net.max, 1.0f), scale;

8922N/A+ float old_max = MAX (g->category.net.max, 1.0f), scale;

8922N/A

8922N/A if (new_max <= old_max)

9799N/A return;

9799N/A@@ -307,7 +311,8 @@ net_scale (LoadGraph *g, float new_max)

9799N/A }

8922N/A }

9799N/A

9799N/A- g->net.max = new_max;

9799N/A+

9799N/A+ g->category.net.max = new_max;

9799N/A }

9799N/A

9799N/A static void

9799N/A@@ -328,12 +333,17 @@ get_net (LoadGraph *g)

8922N/A glibtop_netload netload;

8922N/A glibtop_get_netload (&netload, ifnames[i]);

9595N/A

8922N/A+/* if ((netload.flags & needed_netload_flags) != needed_netload_flags)

8922N/A+ continue;

9595N/A+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))

8922N/A+ continue;

8922N/A+*/

8922N/A if (netload.if_flags & (1 << GLIBTOP_IF_FLAGS_LOOPBACK))

9595N/A continue;

9595N/A-

8922N/A+

9595N/A /* Don't skip interfaces that are down (GLIBTOP_IF_FLAGS_UP)

8922N/A to avoid spikes when they are brought up */

8922N/A-

8922N/A+

8922N/A in += netload.bytes_in;

8922N/A out += netload.bytes_out;

8922N/A }

9595N/A@@ -342,13 +352,13 @@ get_net (LoadGraph *g)

9595N/A

8922N/A g_get_current_time (&time);

8922N/A

8922N/A- if (in >= g->net.last_in && out >= g->net.last_out &&

8922N/A- g->net.time.tv_sec != 0) {

8922N/A+ if (in >= g->category.net.last_in && out >= g->category.net.last_out &&

8922N/A+ g->category.net.time.tv_sec != 0) {

9596N/A float dtime;

8922N/A- dtime = time.tv_sec - g->net.time.tv_sec +

8922N/A- (float) (time.tv_usec - g->net.time.tv_usec) / G_USEC_PER_SEC;

8922N/A- din = (in - g->net.last_in) / dtime;

8922N/A- dout = (out - g->net.last_out) / dtime;

9799N/A+ dtime = time.tv_sec - g->category.net.time.tv_sec +

8922N/A+ (float) (time.tv_usec - g->category.net.time.tv_usec) / G_USEC_PER_SEC;

8922N/A+ din = (in - g->category.net.last_in) / dtime;

8922N/A+ dout = (out - g->category.net.last_out) / dtime;

8922N/A } else {

8922N/A /* Don't calc anything if new data is less than old (interface

9595N/A removed, counters reset, ...) or if it is the first time */

8922N/A@@ -356,15 +366,16 @@ get_net (LoadGraph *g)

8922N/A dout = 0.0f;

9595N/A }

9595N/A

8922N/A- g->net.last_in = in;

9596N/A- g->net.last_out = out;

8922N/A- g->net.time = time;

8922N/A+ g->category.net.last_in = in;

8922N/A+ g->category.net.last_out = out;

8922N/A+ g->category.net.time = time;

8922N/A

8922N/A- g->data[0][0] = din / MAX(g->net.max, 1.0f);

9595N/A- g->data[0][1] = dout / MAX(g->net.max, 1.0f);

9595N/A

8922N/A+ g->data[0][0] = din / MAX(g->category.net.max, 1.0f);

8922N/A+ g->data[0][1] = dout / MAX(g->category.net.max, 1.0f);

8922N/A+

8922N/A net_scale (g, MAX (din, dout));

8922N/A-

8922N/A+

9595N/A text1 = SI_gnome_vfs_format_file_size_for_display (din);

8922N/A text2 = g_strdup_printf (_("%s/s"), text1);

8922N/A gtk_label_set_text (GTK_LABEL (g->labels.net_in), text2);

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/load-graph.h gnome-system-monitor-2.14.1.mod/src/load-graph.h

8922N/A--- gnome-system-monitor-2.14.1/src/load-graph.h 2006-01-02 17:28:58.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/src/load-graph.h 2006-07-19 19:45:43.271548000 +0800

8922N/A@@ -34,35 +34,35 @@ struct _LoadGraphLabels

8922N/A

8922N/A

8922N/A /* Create new load graph. */

8922N/A-LoadGraph *

8922N/A-load_graph_new (gint type, ProcData *procdata) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL LoadGraph *

8922N/A+load_graph_new (gint type, ProcData *procdata);

8922N/A

8922N/A /* Force a drawing update */

8922N/A-void

8922N/A-load_graph_draw (LoadGraph *g) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void

8922N/A+load_graph_draw (LoadGraph *g) ;

8922N/A

8922N/A /* Start load graph. */

8922N/A-void

8922N/A-load_graph_start (LoadGraph *g) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void

8922N/A+load_graph_start (LoadGraph *g) ;

8922N/A

9799N/A /* Stop load graph. */

8922N/A-void

8922N/A-load_graph_stop (LoadGraph *g) G_GNUC_INTERNAL;

9595N/A+G_GNUC_INTERNAL void

8922N/A+load_graph_stop (LoadGraph *g) ;

9595N/A

9595N/A /* Change load graph speed and restart it if it has been previously started */

9595N/A-void

9595N/A+G_GNUC_INTERNAL void

9595N/A load_graph_change_speed (LoadGraph *g,

9595N/A- guint new_speed) G_GNUC_INTERNAL;

8922N/A+ guint new_speed) ;

8922N/A

9595N/A-GdkColor*

9799N/A-load_graph_get_colors (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;

8922N/A+G_GNUC_INTERNAL GdkColor*

8922N/A+load_graph_get_colors (LoadGraph *g) G_GNUC_CONST;

8922N/A

9595N/A-LoadGraphLabels*

8922N/A-load_graph_get_labels (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;

8922N/A+G_GNUC_INTERNAL LoadGraphLabels*

9595N/A+load_graph_get_labels (LoadGraph *g) G_GNUC_CONST;

8922N/A

8922N/A

8922N/A-GtkWidget*

9595N/A-load_graph_get_widget (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;

9595N/A+G_GNUC_INTERNAL GtkWidget*

8922N/A+load_graph_get_widget (LoadGraph *g) G_GNUC_CONST;

9595N/A

8922N/A

9799N/A #endif /* _PROCMAN_LOAD_GRAPH_H_ */

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/memmaps.h gnome-system-monitor-2.14.1.mod/src/memmaps.h

8922N/A--- gnome-system-monitor-2.14.1/src/memmaps.h 2005-03-17 17:23:13.000000000 +0800

8922N/A+++ gnome-system-monitor-2.14.1.mod/src/memmaps.h 2006-07-19 19:46:11.814984000 +0800

8922N/A@@ -4,6 +4,6 @@

8922N/A #include <glib/gtypes.h>

8922N/A #include "procman.h"

8922N/A

9595N/A-void create_memmaps_dialog (ProcData *procdata) G_GNUC_INTERNAL;

9595N/A+G_GNUC_INTERNAL void create_memmaps_dialog (ProcData *procdata) ;

8922N/A

8922N/A #endif /* _PROCMAN_MEMMAPS_H_ */

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/openfiles.h gnome-system-monitor-2.14.1.mod/src/openfiles.h

8922N/A--- gnome-system-monitor-2.14.1/src/openfiles.h 2005-03-17 17:23:13.000000000 +0800

8922N/A+++ gnome-system-monitor-2.14.1.mod/src/openfiles.h 2006-07-19 19:46:23.623237000 +0800

8922N/A@@ -5,7 +5,7 @@

8922N/A

8922N/A #include "procman.h"

8922N/A

8922N/A-void create_openfiles_dialog (ProcData *procdata) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void create_openfiles_dialog (ProcData *procdata) ;

8922N/A

9595N/A

8922N/A #endif

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/prettytable.h gnome-system-monitor-2.14.1.mod/src/prettytable.h

8922N/A--- gnome-system-monitor-2.14.1/src/prettytable.h 2005-02-16 23:40:01.000000000 +0800

9595N/A+++ gnome-system-monitor-2.14.1.mod/src/prettytable.h 2006-07-19 19:46:54.611707000 +0800

8922N/A@@ -6,10 +6,10 @@

8922N/A #include "procman.h"

8922N/A

8922N/A

9595N/A-void pretty_table_new (ProcData *procdata) G_GNUC_INTERNAL;

9595N/A+G_GNUC_INTERNAL void pretty_table_new (ProcData *procdata) ;

8922N/A

9596N/A-GdkPixbuf* pretty_table_get_icon (PrettyTable *pretty_table,

8922N/A- const gchar *command, guint pid) G_GNUC_INTERNAL;

8922N/A-void pretty_table_free (PrettyTable *pretty_table) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL GdkPixbuf* pretty_table_get_icon (PrettyTable *pretty_table,

8922N/A+ const gchar *command, guint pid) ;

9595N/A+G_GNUC_INTERNAL void pretty_table_free (PrettyTable *pretty_table) ;

9595N/A

8922N/A #endif /* _PROCMAN_PRETTYTABLE_H_ */

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procactions.c gnome-system-monitor-2.14.1.mod/src/procactions.c

8922N/A--- gnome-system-monitor-2.14.1/src/procactions.c 2005-12-01 23:46:20.000000000 +0800

8922N/A+++ gnome-system-monitor-2.14.1.mod/src/procactions.c 2006-07-20 16:43:42.394779000 +0800

8922N/A@@ -25,6 +25,8 @@

8922N/A #include <signal.h>

8922N/A #include <sys/time.h>

8922N/A #include <sys/resource.h>

8922N/A+#include <procfs.h>

8922N/A+#include <fcntl.h>

8922N/A #include "procactions.h"

9799N/A #include "procman.h"

8922N/A #include "proctable.h"

8922N/A@@ -111,12 +113,35 @@ kill_single_process (GtkTreeModel *model

9595N/A int error;

8922N/A int saved_errno;

9595N/A GtkWidget *dialog;

9595N/A-

9595N/A+ int fd;

9595N/A+ char buffer[BUFSIZ];

9595N/A+ struct pstatus *pstatus;

8922N/A+

8922N/A gtk_tree_model_get (model, iter, COL_POINTER, &info, -1);

9595N/A

8922N/A if (!info)

8922N/A return;

9595N/A-

8922N/A+ /*

8922N/A+ * If the process is a system process, we can't control it even as root

8922N/A+ */

9595N/A+ sprintf(buffer, "/proc/%d/status", (int)info->pid);

9595N/A+ if((fd = s_open(buffer, O_RDONLY)) < 0)

8922N/A+ return;

9595N/A+

8922N/A+ if(s_pread(fd, pstatus, sizeof(struct pstatus), 0)

9799N/A+ != sizeof(struct pstatus))

8922N/A+ {

8922N/A+ s_close(fd);

8922N/A+ return;

8922N/A+ }

8922N/A+

8922N/A+ s_close(fd);

8922N/A+

9595N/A+ if (pstatus->pr_flags & PR_ISSYS) {

9595N/A+ return;

8922N/A+ }

8922N/A+

8922N/A+ /* if it is not a system process, we can kill it now */

8922N/A error = kill (info->pid, args->signal);

8922N/A

8922N/A /* success */

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procactions.h gnome-system-monitor-2.14.1.mod/src/procactions.h

8922N/A--- gnome-system-monitor-2.14.1/src/procactions.h 2005-12-01 21:06:34.000000000 +0800

8922N/A+++ gnome-system-monitor-2.14.1.mod/src/procactions.h 2006-07-19 19:47:15.262213000 +0800

8922N/A@@ -21,8 +21,8 @@

8922N/A

8922N/A #include "procman.h"

9595N/A

8922N/A-void renice (ProcData *procdata, int nice) G_GNUC_INTERNAL;

8922N/A-void kill_process (ProcData *procdata, int sig) G_GNUC_INTERNAL;

8922N/A+G_GNUC_INTERNAL void renice (ProcData *procdata, int nice) ;

9595N/A+G_GNUC_INTERNAL void kill_process (ProcData *procdata, int sig) ;

8922N/A

8922N/A #endif

8922N/A

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procdialogs.c gnome-system-monitor-2.14.1.mod/src/procdialogs.c

9595N/A--- gnome-system-monitor-2.14.1/src/procdialogs.c 2006-04-10 01:19:39.000000000 +0800

9595N/A+++ gnome-system-monitor-2.14.1.mod/src/procdialogs.c 2006-07-08 02:26:05.271840000 +0800

8922N/A@@ -333,7 +333,7 @@ smooth_refresh_toggled(GtkToggleButton *

9596N/A

8922N/A gboolean toggled;

8922N/A

8922N/A- toggled = gtk_toggle_button_get_active(button);

8922N/A+ toggled = TRUE; /*gtk_toggle_button_get_active(button);*/

9595N/A

9595N/A gconf_client_set_bool(client, SMOOTH_REFRESH_KEY, toggled, NULL);

8922N/A }

8922N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procdialogs.h gnome-system-monitor-2.14.1.mod/src/procdialogs.h

8922N/A--- gnome-system-monitor-2.14.1/src/procdialogs.h 2005-12-01 23:46:20.000000000 +0800

8922N/A+++ gnome-system-monitor-2.14.1.mod/src/procdialogs.h 2006-07-19 19:47:52.878996000 +0800

8922N/A@@ -42,14 +42,14 @@ typedef enum

8922N/A } ProcmanActionType;

8922N/A

8922N/A

8922N/A-void procdialog_create_hide_dialog (ProcData *data) G_GNUC_INTERNAL;

8922N/A-void procdialog_create_kill_dialog (ProcData *data, int signal) G_GNUC_INTERNAL;

8922N/A-void procdialog_create_renice_dialog (ProcData *data) G_GNUC_INTERNAL;

9799N/A-gboolean procdialog_create_root_password_dialog (ProcmanActionType type,

8922N/A+G_GNUC_INTERNAL void procdialog_create_hide_dialog (ProcData *data) ;

8922N/A+G_GNUC_INTERNAL void procdialog_create_kill_dialog (ProcData *data, int signal) ;

9595N/A+G_GNUC_INTERNAL void procdialog_create_renice_dialog (ProcData *data) ;

8922N/A+G_GNUC_INTERNAL gboolean procdialog_create_root_password_dialog (ProcmanActionType type,

9595N/A ProcData *procdata,

9595N/A- gint pid, gint extra_value) G_GNUC_INTERNAL;

9595N/A-void procdialog_create_memmaps_dialog (ProcData *data) G_GNUC_INTERNAL;

9595N/A-void procdialog_create_preferences_dialog (ProcData *data) G_GNUC_INTERNAL;

8922N/A+ gint pid, gint extra_value) ;

8922N/A+G_GNUC_INTERNAL void procdialog_create_memmaps_dialog (ProcData *data) ;

8922N/A+G_GNUC_INTERNAL void procdialog_create_preferences_dialog (ProcData *data) ;

9595N/A

9799N/A #endif

9799N/A

9799N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procman.h gnome-system-monitor-2.14.1.mod/src/procman.h

9595N/A--- gnome-system-monitor-2.14.1/src/procman.h 2006-03-25 16:35:49.000000000 +0800

9595N/A+++ gnome-system-monitor-2.14.1.mod/src/procman.h 2006-07-19 19:48:19.238672000 +0800

8405N/A@@ -179,9 +179,9 @@ struct _ProcData

8405N/A SmoothRefresh *smooth_refresh;

8405N/A };

9370N/A

8405N/A-void procman_save_config (ProcData *data) G_GNUC_INTERNAL;

8405N/A-void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) G_GNUC_INTERNAL;

9370N/A-gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) G_GNUC_INTERNAL;

9370N/A+G_GNUC_INTERNAL void procman_save_config (ProcData *data) ;

9370N/A+G_GNUC_INTERNAL void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;

9370N/A+G_GNUC_INTERNAL gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;

8405N/A

8405N/A

9799N/A

9799N/Adiff -Nrup gnome-system-monitor-2.14.1/src/proctable.c gnome-system-monitor-2.14.1.mod/src/proctable.c

9799N/A--- gnome-system-monitor-2.14.1/src/proctable.c 2006-02-27 17:44:35.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/src/proctable.c 2006-07-19 18:47:48.938626000 +0800

9311N/A@@ -53,7 +53,6 @@

9311N/A #include "selinux.h"

8403N/A #include "e_date.h"

8922N/A

8922N/A-

8922N/A static guint64 total_time = 1;

8922N/A static guint64 total_time_last = 1;

8922N/A

8922N/A@@ -533,16 +532,19 @@ get_process_memory_info(ProcInfo *info)

8922N/A wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),

8922N/A info->pid,

8922N/A &xresources);

8922N/A+ info->memxserver = xresources.total_bytes_estimate;

8922N/A+

8922N/A+ get_process_memory_writable(info);

8922N/A

9311N/A glibtop_get_proc_mem(&procmem, info->pid);

9311N/A-

9311N/A info->vmsize = procmem.vsize;

8922N/A info->memres = procmem.resident;

9799N/A- info->memshared = procmem.share;

9799N/A-

9799N/A- info->memxserver = xresources.total_bytes_estimate;

9799N/A+ info->memshared = procmem.share;

9799N/A+

9799N/A+#ifdef __sun

9799N/A+ info->pcpu = procmem.load;

9799N/A+#endif

9799N/A

9799N/A- get_process_memory_writable(info);

9799N/A }

9799N/A

9799N/A

9799N/A@@ -795,15 +797,16 @@ update_info (ProcData *procdata, ProcInf

9799N/A glibtop_get_proc_uid (&procuid, info->pid);

9799N/A glibtop_get_proc_time (&proctime, info->pid);

9799N/A

9799N/A- get_process_memory_info(info);

9799N/A get_process_user(procdata, info, procstate.uid);

9799N/A-

9799N/A- info->pcpu = (proctime.rtime - info->cpu_time_last) * 100 / total_time;

9799N/A- info->pcpu = MIN(info->pcpu, 100);

9799N/A-

9799N/A- info->cpu_time_last = proctime.rtime;

9799N/A+ info->pcpu = (proctime.rtime - info->cpu_time_last) * 100 / total_time;

9799N/A+ info->pcpu = MIN(info->pcpu, 100);

9799N/A+

9799N/A+ /* there is a bug here, because info can't store cpu_time_last, it's only a temporary variable in refresh_list() */

9799N/A+ info->cpu_time_last = proctime.rtime;

9799N/A info->nice = procuid.nice;

9799N/A-

9799N/A+

9799N/A+ /* if at Solaris, in get_process_memory_info() info->pcpu will get again from glibtop_get_proc_mem() */

9799N/A+ get_process_memory_info(info);

9799N/A

9799N/A model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));

9799N/A

9799N/A@@ -963,8 +966,9 @@ proctable_update_list (ProcData * const

9799N/A /* FIXME: total cpu time elapsed should be calculated on an individual basis here

9799N/A ** should probably have a total_time_last gint in the ProcInfo structure */

9799N/A glibtop_get_cpu (&cpu);

9799N/A- total_time = MAX(cpu.total - total_time_last, 1);

9799N/A- total_time_last = cpu.total;

9799N/A+ /* total is normally is 1/100 second, if transfer to second, have to divide by frequency */

9799N/A+ total_time = MAX(cpu.total / cpu.frequency - total_time_last, 1);

9799N/A+ total_time_last = cpu.total / cpu.frequency;

9799N/A

9799N/A refresh_list (procdata, pid_list, proclist.number);

9799N/A

9799N/Adiff -Nrup gnome-system-monitor-2.14.1/src/proctable.h gnome-system-monitor-2.14.1.mod/src/proctable.h

9799N/A--- gnome-system-monitor-2.14.1/src/proctable.h 2005-12-27 23:28:53.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/src/proctable.h 2006-07-19 19:49:18.901282000 +0800

9799N/A@@ -47,19 +47,19 @@ enum

9799N/A };

9799N/A

9799N/A

9799N/A-GtkWidget* proctable_new (ProcData *data) G_GNUC_INTERNAL;

9799N/A-void proctable_update_table (ProcData *data) G_GNUC_INTERNAL;

9799N/A-void proctable_update_list (ProcData *data) G_GNUC_INTERNAL;

9799N/A-void insert_info_to_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;

9799N/A-void remove_info_from_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;

9799N/A-ProcInfo * proctable_find_process (guint pid, ProcData *procdata) G_GNUC_INTERNAL;

9799N/A-void proctable_update_all (ProcData *data) G_GNUC_INTERNAL;

9799N/A-void proctable_clear_tree (ProcData *data) G_GNUC_INTERNAL;

9799N/A-void proctable_free_table (ProcData *data) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL GtkWidget* proctable_new (ProcData *data) ;

9799N/A+G_GNUC_INTERNAL void proctable_update_table (ProcData *data) ;

9799N/A+G_GNUC_INTERNAL void proctable_update_list (ProcData *data) ;

9799N/A+G_GNUC_INTERNAL void insert_info_to_tree (ProcInfo *info, ProcData *procdata) ;

9799N/A+G_GNUC_INTERNAL void remove_info_from_tree (ProcInfo *info, ProcData *procdata) ;

9799N/A+G_GNUC_INTERNAL ProcInfo * proctable_find_process (guint pid, ProcData *procdata) ;

9799N/A+G_GNUC_INTERNAL void proctable_update_all (ProcData *data) ;

9799N/A+G_GNUC_INTERNAL void proctable_clear_tree (ProcData *data) ;

9799N/A+G_GNUC_INTERNAL void proctable_free_table (ProcData *data) ;

9799N/A

9799N/A-GSList* proctable_get_columns_order(GtkTreeView *treeview) G_GNUC_INTERNAL;

9799N/A-void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL GSList* proctable_get_columns_order(GtkTreeView *treeview) ;

9799N/A+G_GNUC_INTERNAL void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) ;

9799N/A

9799N/A-char* make_loadavg_string(void) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL char* make_loadavg_string(void) ;

9799N/A

9799N/A #endif /* _PROCMAN_PROCTABLE_H_ */

9799N/Adiff -Nrup gnome-system-monitor-2.14.1/src/selinux.h gnome-system-monitor-2.14.1.mod/src/selinux.h

9799N/A--- gnome-system-monitor-2.14.1/src/selinux.h 2005-05-25 20:15:45.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/src/selinux.h 2006-07-19 19:49:34.954362000 +0800

9799N/A@@ -8,11 +8,11 @@

9799N/A

9799N/A #if HAVE_SELINUX

9799N/A

9799N/A-void

9799N/A-get_process_selinux_context (ProcInfo *info) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL void

9799N/A+get_process_selinux_context (ProcInfo *info) ;

9799N/A

9799N/A-gboolean

9799N/A-can_show_security_context_column (void) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL gboolean

9799N/A+can_show_security_context_column (void) ;

9799N/A

9799N/A #else /* ! HAVE_SELINUX */

9799N/A

9799N/Adiff -Nrup gnome-system-monitor-2.14.1/src/smooth_refresh.c gnome-system-monitor-2.14.1.mod/src/smooth_refresh.c

9799N/A--- gnome-system-monitor-2.14.1/src/smooth_refresh.c 2005-12-28 00:14:59.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/src/smooth_refresh.c 2006-07-19 18:47:58.412015000 +0800

9799N/A@@ -181,8 +181,10 @@ smooth_refresh_get(SmoothRefresh *sm, gu

9799N/A gboolean changed;

9799N/A float pcpu;

9799N/A

9799N/A- if (!sm->active)

9799N/A+ if (!sm->active){

9799N/A+ *new_interval = sm->interval;

9799N/A return FALSE;

9799N/A+ }

9799N/A

9799N/A pcpu = get_own_cpu_usage(sm);

9799N/A /*

9799N/A@@ -241,6 +243,8 @@ smooth_refresh_get(SmoothRefresh *sm, gu

9799N/A *sm->config_interval,

9799N/A ctime(&now));

9799N/A }

9799N/A+ else

9799N/A+ *new_interval = sm->interval;

9799N/A

9799N/A g_assert(sm->interval == *new_interval);

9799N/A g_assert(sm->interval >= *sm->config_interval);

9799N/Adiff -Nrup gnome-system-monitor-2.14.1/src/smooth_refresh.h gnome-system-monitor-2.14.1.mod/src/smooth_refresh.h

9799N/A--- gnome-system-monitor-2.14.1/src/smooth_refresh.h 2005-12-28 00:14:59.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/src/smooth_refresh.h 2006-07-19 19:50:05.712418000 +0800

9799N/A@@ -18,8 +18,8 @@ typedef struct _SmoothRefresh SmoothRefr

9799N/A @return : initialized SmoothRefresh

9799N/A */

9799N/A

9799N/A-SmoothRefresh*

9799N/A-smooth_refresh_new(const guint * config_interval) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL SmoothRefresh*

9799N/A+smooth_refresh_new(const guint * config_interval) ;

9799N/A

9799N/A

9799N/A

9799N/A@@ -30,8 +30,8 @@ smooth_refresh_new(const guint * config_

9799N/A

9799N/A */

9799N/A

9799N/A-void

9799N/A-smooth_refresh_reset(SmoothRefresh *sm) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL void

9799N/A+smooth_refresh_reset(SmoothRefresh *sm) ;

9799N/A

9799N/A

9799N/A

9799N/A@@ -42,8 +42,8 @@ smooth_refresh_reset(SmoothRefresh *sm)

9799N/A

9799N/A */

9799N/A

9799N/A-void

9799N/A-smooth_refresh_destroy(SmoothRefresh *sm) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL void

9799N/A+smooth_refresh_destroy(SmoothRefresh *sm) ;

9799N/A

9799N/A

9799N/A

9799N/A@@ -59,8 +59,8 @@ smooth_refresh_destroy(SmoothRefresh *sm

9799N/A is stored in @new_interval. Else FALSE;

9799N/A */

9799N/A

9799N/A-gboolean

9799N/A-smooth_refresh_get(SmoothRefresh *sm, guint *new_interval) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL gboolean

9799N/A+smooth_refresh_get(SmoothRefresh *sm, guint *new_interval) ;

9799N/A

9799N/A

9799N/A #endif /* _PROCMAN_SMOOTH_REFRESH */

9799N/Adiff -Nrup gnome-system-monitor-2.14.1/src/util.h gnome-system-monitor-2.14.1.mod/src/util.h

9799N/A--- gnome-system-monitor-2.14.1/src/util.h 2005-08-05 02:45:17.000000000 +0800

9799N/A+++ gnome-system-monitor-2.14.1.mod/src/util.h 2006-07-19 19:50:38.877926000 +0800

9799N/A@@ -5,7 +5,7 @@

9799N/A #include <libgnomevfs/gnome-vfs-utils.h>

9799N/A #include <stddef.h>

9799N/A

9799N/A-void _procman_array_gettext_init(const char * strings[], size_t n) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL void _procman_array_gettext_init(const char * strings[], size_t n) ;

9799N/A

9799N/A #define PROCMAN_GETTEXT_ARRAY_INIT(A) G_STMT_START { \

9799N/A static gboolean is_init = FALSE; \

9799N/A@@ -19,14 +19,14 @@ if(!is_init) { \

9799N/A #define PROCMAN_RCMP(X, Y) PROCMAN_CMP((Y), (X))

9799N/A

9799N/A

9799N/A-GtkWidget*

9799N/A+G_GNUC_INTERNAL GtkWidget*

9799N/A procman_make_label_for_mmaps_or_ofiles(const char *format,

9799N/A const char *process_name,

9799N/A- unsigned pid) G_GNUC_INTERNAL;

9799N/A+ unsigned pid) ;

9799N/A

9799N/A

9799N/A-gchar*

9799N/A-SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) G_GNUC_INTERNAL;

9799N/A+G_GNUC_INTERNAL gchar*

9799N/A+SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) ;

9799N/A

9799N/A

9799N/A #endif /* H_GNOME_SYSTEM_MONITOR_UTIL_1123178725 */

9799N/A