gnome-system-monitor-01-solaris.diff revision 8522
8522N/A--- gnome-system-monitor-2.15.90/configure.in.orig 2006-07-27 14:20:43.894249000 +0100
8522N/A+++ gnome-system-monitor-2.15.90/configure.in 2006-07-27 14:21:10.814488000 +0100
8522N/A@@ -31,6 +31,12 @@
8522N/A GNOME_VFS_REQUIRED=2.6.0
8522N/A GNOME_ICON_THEME_REQUIRED=2.15.3
8403N/A
8403N/A+case "$host" in
8403N/A+*-*-solaris*) GMSGFMT_CHECKOPT= ;;
8403N/A+*) GMSGFMT_CHECKOPT=-c ;;
8403N/A+esac
8403N/A+AC_SUBST( GMSGFMT_CHECKOPT)
8403N/A+
8522N/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 gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED)
8403N/A
8403N/A
8403N/Adiff -Nrup gnome-system-monitor-2.14.1/po/Makefile.in.in gnome-system-monitor-2.14.1.mod/po/Makefile.in.in
8403N/A--- gnome-system-monitor-2.14.1/po/Makefile.in.in 2006-04-10 19:51:06.000000000 +0800
8403N/A+++ gnome-system-monitor-2.14.1.mod/po/Makefile.in.in 2006-06-23 17:19:28.802301000 +0800
8403N/A@@ -48,6 +48,7 @@ INSTALL_DATA = @INSTALL_DATA@
8403N/A
8403N/A CC = @CC@
8403N/A GMSGFMT = @GMSGFMT@
8403N/A+GMSGFMT_CHECKOPT = @GMSGFMT_CHECKOPT@
8403N/A MSGFMT = @MSGFMT@
8403N/A XGETTEXT = @XGETTEXT@
8403N/A INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
8403N/A@@ -90,7 +91,7 @@ CATOBJEXT = @CATOBJEXT@
8403N/A
8403N/A .po.gmo:
8403N/A file=`echo $* | sed 's,.*/,,'`.gmo \
8403N/A- && rm -f $$file && $(GMSGFMT) -o $$file $<
8403N/A+ && rm -f $$file && $(GMSGFMT) -o $(GMSGFMT_CHECKOPT) $$file $<
8403N/A
8403N/A .po.cat:
8403N/A sed -f ../intl/po2msg.sed < $< > $*.msg \
8403N/Adiff -Nrup gnome-system-monitor-2.14.1/src/callbacks.c gnome-system-monitor-2.14.1.mod/src/callbacks.c
8403N/A--- gnome-system-monitor-2.14.1/src/callbacks.c 2005-09-04 10:49:43.000000000 +0800
8403N/A+++ gnome-system-monitor-2.14.1.mod/src/callbacks.c 2006-07-19 18:47:13.274807000 +0800
8403N/A@@ -371,7 +371,6 @@ cb_change_current_page (GtkNotebook *nb,
8403N/A
8403N/A
8403N/A if (num == 0) {
8403N/A-
8403N/A cb_timeout (procdata);
8403N/A
8403N/A if (!procdata->timeout)
8403N/A@@ -450,7 +449,11 @@ cb_timeout (gpointer data)
8403N/A return FALSE;
8403N/A }
8403N/A
8403N/A- return TRUE;
8403N/A+ procdata->timeout = g_timeout_add(new_interval,
8403N/A+ cb_timeout,
8403N/A+ procdata);
8403N/A+
8403N/A+ return FALSE;
8403N/A }
8403N/A
8403N/A
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/callbacks.h gnome-system-monitor-2.14.1.mod/src/callbacks.h
8405N/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
8405N/A@@ -25,64 +25,64 @@
8405N/A #include "procman.h"
8405N/A #include <libgnomevfs/gnome-vfs.h>
8405N/A
8405N/A-void cb_show_memory_maps (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_show_open_files (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_renice (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_end_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_kill_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_hide_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_show_hidden_processes (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_edit_preferences (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_help_contents (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_about (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_app_exit (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/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;
8405N/A-
8405N/A-void cb_info_button_pressed (GtkButton *button, gpointer user_data) G_GNUC_INTERNAL;
8405N/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;
8405N/A-void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/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-
8405N/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,
8405N/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) ;
8405N/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+
8405N/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+
8405N/A+G_GNUC_INTERNAL void cb_app_exit (GtkAction *action, gpointer data) ;
8405N/A+G_GNUC_INTERNAL gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data) ;
8405N/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) ;
8405N/A+G_GNUC_INTERNAL void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data) ;
8405N/A+G_GNUC_INTERNAL void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data) ;
8405N/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) ;
8405N/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,
8405N/A+ gpointer data) ;
8405N/A+
8405N/A+
8405N/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,
8405N/A+ gint num, gpointer data) ;
8405N/A
8405N/A-gint cb_update_disks (gpointer data) G_GNUC_INTERNAL;
8405N/A-gint cb_timeout (gpointer data) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL gint cb_update_disks (gpointer data) ;
8405N/A+G_GNUC_INTERNAL gint cb_timeout (gpointer data) ;
8405N/A
8405N/A-void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
8405N/A+G_GNUC_INTERNAL void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
8405N/A GnomeVFSVolume *vol,
8405N/A- gpointer procdata) G_GNUC_INTERNAL;
8405N/A+ gpointer procdata) ;
8405N/A
8405N/A-void cb_radio_processes(GtkAction *action,
8405N/A+G_GNUC_INTERNAL void cb_radio_processes(GtkAction *action,
8405N/A GtkRadioAction *current,
8405N/A- gpointer data) G_GNUC_INTERNAL;
8405N/A+ gpointer data) ;
8405N/A
8405N/A
8405N/A
8405N/A-void cb_kill_sigstop(GtkAction *action,
8405N/A- gpointer data) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void cb_kill_sigstop(GtkAction *action,
8405N/A+ gpointer data) ;
8405N/A
8405N/A-void cb_kill_sigcont(GtkAction *action,
8405N/A- gpointer data) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void cb_kill_sigcont(GtkAction *action,
8405N/A+ gpointer data) ;
8405N/A
8405N/A
8405N/A #endif /* _PROCMAN_CALLBACKS_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/favorites.h gnome-system-monitor-2.14.1.mod/src/favorites.h
8405N/A--- gnome-system-monitor-2.14.1/src/favorites.h 2005-03-17 17:23:13.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/favorites.h 2006-07-19 19:43:15.233467000 +0800
8405N/A@@ -26,15 +26,15 @@
8405N/A
8405N/A #include "procman.h"
8405N/A
8405N/A-void save_blacklist (ProcData *procdata, GConfClient *client) G_GNUC_INTERNAL;
8405N/A-void add_to_blacklist (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;
8405N/A-void add_selected_to_blacklist (ProcData *procdata) G_GNUC_INTERNAL;
8405N/A-void remove_from_blacklist (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void save_blacklist (ProcData *procdata, GConfClient *client);
8405N/A+G_GNUC_INTERNAL void add_to_blacklist (ProcData *procdata, gchar *name) ;
8405N/A+G_GNUC_INTERNAL void add_selected_to_blacklist (ProcData *procdata) ;
8405N/A+G_GNUC_INTERNAL void remove_from_blacklist (ProcData *procdata, gchar *name) ;
8405N/A
8405N/A-gboolean is_process_blacklisted (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL gboolean is_process_blacklisted (ProcData *procdata, gchar *name) ;
8405N/A
8405N/A-void get_blacklist (ProcData *procdata, GConfClient *client) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void get_blacklist (ProcData *procdata, GConfClient *client) ;
8405N/A
8405N/A-void create_blacklist_dialog (ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void create_blacklist_dialog (ProcData *procdata) ;
8405N/A
8405N/A #endif
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/interface.h gnome-system-monitor-2.14.1.mod/src/interface.h
8405N/A--- gnome-system-monitor-2.14.1/src/interface.h 2005-03-17 22:23:42.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/interface.h 2006-07-19 19:44:10.487576000 +0800
8405N/A@@ -25,9 +25,9 @@
8405N/A #include "procman.h"
8405N/A
8405N/A
8405N/A-void create_main_window (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void update_sensitivity (ProcData *data, gboolean sensitivity) G_GNUC_INTERNAL;
8405N/A-void do_popup_menu(ProcData *data, GdkEventButton *event) G_GNUC_INTERNAL;
8405N/A-GtkWidget * make_title_label (const char *text) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void create_main_window (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void update_sensitivity (ProcData *data, gboolean sensitivity) ;
8405N/A+G_GNUC_INTERNAL void do_popup_menu(ProcData *data, GdkEventButton *event) ;
8405N/A+G_GNUC_INTERNAL GtkWidget * make_title_label (const char *text) ;
8405N/A
8405N/A #endif /* _PROCMAN_INTERFACE_H_ */
8403N/Adiff -Nrup gnome-system-monitor-2.14.1/src/load-graph.c gnome-system-monitor-2.14.1.mod/src/load-graph.c
8403N/A--- gnome-system-monitor-2.14.1/src/load-graph.c 2006-04-10 00:46:29.000000000 +0800
8403N/A+++ gnome-system-monitor-2.14.1.mod/src/load-graph.c 2006-07-07 14:16:03.034343000 +0800
8403N/A@@ -26,6 +26,10 @@
8403N/A
8403N/A #define NUM_POINTS 100
8403N/A #define GRAPH_MIN_HEIGHT 30
8403N/A+/*static const unsigned needed_netload_flags =
8403N/A+(1 << GLIBTOP_NETLOAD_IF_FLAGS) +
8403N/A+(1 << GLIBTOP_NETLOAD_BYTES_TOTAL);
8403N/A+*/
8403N/A
8403N/A
8403N/A enum {
8522N/A@@ -61,7 +61,7 @@
8522N/A
8522N/A LoadGraphLabels labels;
8522N/A
8522N/A- /* union { */
8522N/A+ union {
8522N/A struct {
8522N/A gboolean initialized;
8522N/A guint now; /* 0 -> current, 1 -> last
8522N/A@@ -75,7 +75,7 @@
8403N/A GTimeVal time;
8403N/A float max;
8403N/A } net;
8522N/A- /* }; */
8403N/A+ }category;
8403N/A };
8403N/A
8403N/A
8403N/A@@ -206,8 +210,8 @@ get_load (LoadGraph *g)
8403N/A
8403N/A #undef NOW
8403N/A #undef LAST
8403N/A-#define NOW (g->cpu.times[g->cpu.now])
8403N/A-#define LAST (g->cpu.times[g->cpu.now ^ 1])
8403N/A+#define NOW (g->category.cpu.times[g->category.cpu.now])
8403N/A+#define LAST (g->category.cpu.times[g->category.cpu.now ^ 1])
8403N/A
8403N/A if (g->n == 1) {
8403N/A NOW[0][CPU_TOTAL] = cpu.total;
8403N/A@@ -220,9 +224,9 @@ get_load (LoadGraph *g)
8403N/A }
8403N/A }
8403N/A
8403N/A- if (G_UNLIKELY(!g->cpu.initialized)) {
8403N/A+ if (G_UNLIKELY(!g->category.cpu.initialized)) {
8403N/A /* No data yet */
8403N/A- g->cpu.initialized = TRUE;
8403N/A+ g->category.cpu.initialized = TRUE;
8403N/A } else {
8403N/A for (i = 0; i < g->n; i++) {
8403N/A float load;
8403N/A@@ -242,7 +246,7 @@ get_load (LoadGraph *g)
8403N/A }
8403N/A }
8403N/A
8403N/A- g->cpu.now ^= 1;
8403N/A+ g->category.cpu.now ^= 1;
8403N/A
8403N/A #undef NOW
8403N/A #undef LAST
8403N/A@@ -293,7 +297,7 @@ static void
8403N/A net_scale (LoadGraph *g, float new_max)
8403N/A {
8403N/A gint i;
8403N/A- float old_max = MAX (g->net.max, 1.0f), scale;
8403N/A+ float old_max = MAX (g->category.net.max, 1.0f), scale;
8403N/A
8403N/A if (new_max <= old_max)
8403N/A return;
8403N/A@@ -307,7 +311,8 @@ net_scale (LoadGraph *g, float new_max)
8403N/A }
8403N/A }
8403N/A
8403N/A- g->net.max = new_max;
8403N/A+
8403N/A+ g->category.net.max = new_max;
8403N/A }
8403N/A
8403N/A static void
8403N/A@@ -328,12 +333,17 @@ get_net (LoadGraph *g)
8403N/A glibtop_netload netload;
8403N/A glibtop_get_netload (&netload, ifnames[i]);
8403N/A
8403N/A+/* if ((netload.flags & needed_netload_flags) != needed_netload_flags)
8403N/A+ continue;
8403N/A+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
8403N/A+ continue;
8403N/A+*/
8403N/A if (netload.if_flags & (1 << GLIBTOP_IF_FLAGS_LOOPBACK))
8403N/A continue;
8403N/A-
8403N/A+
8403N/A /* Don't skip interfaces that are down (GLIBTOP_IF_FLAGS_UP)
8403N/A to avoid spikes when they are brought up */
8403N/A-
8403N/A+
8403N/A in += netload.bytes_in;
8403N/A out += netload.bytes_out;
8403N/A }
8403N/A@@ -342,13 +352,13 @@ get_net (LoadGraph *g)
8403N/A
8403N/A g_get_current_time (&time);
8403N/A
8403N/A- if (in >= g->net.last_in && out >= g->net.last_out &&
8403N/A- g->net.time.tv_sec != 0) {
8403N/A+ if (in >= g->category.net.last_in && out >= g->category.net.last_out &&
8403N/A+ g->category.net.time.tv_sec != 0) {
8403N/A float dtime;
8403N/A- dtime = time.tv_sec - g->net.time.tv_sec +
8403N/A- (float) (time.tv_usec - g->net.time.tv_usec) / G_USEC_PER_SEC;
8403N/A- din = (in - g->net.last_in) / dtime;
8403N/A- dout = (out - g->net.last_out) / dtime;
8403N/A+ dtime = time.tv_sec - g->category.net.time.tv_sec +
8403N/A+ (float) (time.tv_usec - g->category.net.time.tv_usec) / G_USEC_PER_SEC;
8403N/A+ din = (in - g->category.net.last_in) / dtime;
8403N/A+ dout = (out - g->category.net.last_out) / dtime;
8403N/A } else {
8403N/A /* Don't calc anything if new data is less than old (interface
8403N/A removed, counters reset, ...) or if it is the first time */
8403N/A@@ -356,15 +366,16 @@ get_net (LoadGraph *g)
8403N/A dout = 0.0f;
8403N/A }
8403N/A
8403N/A- g->net.last_in = in;
8403N/A- g->net.last_out = out;
8403N/A- g->net.time = time;
8403N/A+ g->category.net.last_in = in;
8403N/A+ g->category.net.last_out = out;
8403N/A+ g->category.net.time = time;
8403N/A
8403N/A- g->data[0][0] = din / MAX(g->net.max, 1.0f);
8403N/A- g->data[0][1] = dout / MAX(g->net.max, 1.0f);
8403N/A
8403N/A+ g->data[0][0] = din / MAX(g->category.net.max, 1.0f);
8403N/A+ g->data[0][1] = dout / MAX(g->category.net.max, 1.0f);
8403N/A+
8403N/A net_scale (g, MAX (din, dout));
8403N/A-
8403N/A+
8403N/A text1 = SI_gnome_vfs_format_file_size_for_display (din);
8403N/A text2 = g_strdup_printf (_("%s/s"), text1);
8403N/A gtk_label_set_text (GTK_LABEL (g->labels.net_in), text2);
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/load-graph.h gnome-system-monitor-2.14.1.mod/src/load-graph.h
8405N/A--- gnome-system-monitor-2.14.1/src/load-graph.h 2006-01-02 17:28:58.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/load-graph.h 2006-07-19 19:45:43.271548000 +0800
8405N/A@@ -34,35 +34,35 @@ struct _LoadGraphLabels
8405N/A
8405N/A
8405N/A /* Create new load graph. */
8405N/A-LoadGraph *
8405N/A-load_graph_new (gint type, ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL LoadGraph *
8405N/A+load_graph_new (gint type, ProcData *procdata);
8405N/A
8405N/A /* Force a drawing update */
8405N/A-void
8405N/A-load_graph_draw (LoadGraph *g) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
8405N/A+load_graph_draw (LoadGraph *g) ;
8405N/A
8405N/A /* Start load graph. */
8405N/A-void
8405N/A-load_graph_start (LoadGraph *g) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
8405N/A+load_graph_start (LoadGraph *g) ;
8405N/A
8405N/A /* Stop load graph. */
8405N/A-void
8405N/A-load_graph_stop (LoadGraph *g) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
8405N/A+load_graph_stop (LoadGraph *g) ;
8405N/A
8405N/A /* Change load graph speed and restart it if it has been previously started */
8405N/A-void
8405N/A+G_GNUC_INTERNAL void
8405N/A load_graph_change_speed (LoadGraph *g,
8405N/A- guint new_speed) G_GNUC_INTERNAL;
8405N/A+ guint new_speed) ;
8405N/A
8405N/A-GdkColor*
8405N/A-load_graph_get_colors (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL GdkColor*
8405N/A+load_graph_get_colors (LoadGraph *g) G_GNUC_CONST;
8405N/A
8405N/A-LoadGraphLabels*
8405N/A-load_graph_get_labels (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL LoadGraphLabels*
8405N/A+load_graph_get_labels (LoadGraph *g) G_GNUC_CONST;
8405N/A
8405N/A
8405N/A-GtkWidget*
8405N/A-load_graph_get_widget (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL GtkWidget*
8405N/A+load_graph_get_widget (LoadGraph *g) G_GNUC_CONST;
8405N/A
8405N/A
8405N/A #endif /* _PROCMAN_LOAD_GRAPH_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/memmaps.h gnome-system-monitor-2.14.1.mod/src/memmaps.h
8405N/A--- gnome-system-monitor-2.14.1/src/memmaps.h 2005-03-17 17:23:13.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/memmaps.h 2006-07-19 19:46:11.814984000 +0800
8405N/A@@ -4,6 +4,6 @@
8405N/A #include <glib/gtypes.h>
8405N/A #include "procman.h"
8405N/A
8405N/A-void create_memmaps_dialog (ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void create_memmaps_dialog (ProcData *procdata) ;
8405N/A
8405N/A #endif /* _PROCMAN_MEMMAPS_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/openfiles.h gnome-system-monitor-2.14.1.mod/src/openfiles.h
8405N/A--- gnome-system-monitor-2.14.1/src/openfiles.h 2005-03-17 17:23:13.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/openfiles.h 2006-07-19 19:46:23.623237000 +0800
8405N/A@@ -5,7 +5,7 @@
8405N/A
8405N/A #include "procman.h"
8405N/A
8405N/A-void create_openfiles_dialog (ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void create_openfiles_dialog (ProcData *procdata) ;
8405N/A
8405N/A
8405N/A #endif
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/prettytable.h gnome-system-monitor-2.14.1.mod/src/prettytable.h
8405N/A--- gnome-system-monitor-2.14.1/src/prettytable.h 2005-02-16 23:40:01.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/prettytable.h 2006-07-19 19:46:54.611707000 +0800
8405N/A@@ -6,10 +6,10 @@
8405N/A #include "procman.h"
8405N/A
8405N/A
8405N/A-void pretty_table_new (ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void pretty_table_new (ProcData *procdata) ;
8405N/A
8405N/A-GdkPixbuf* pretty_table_get_icon (PrettyTable *pretty_table,
8405N/A- const gchar *command, guint pid) G_GNUC_INTERNAL;
8405N/A-void pretty_table_free (PrettyTable *pretty_table) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL GdkPixbuf* pretty_table_get_icon (PrettyTable *pretty_table,
8405N/A+ const gchar *command, guint pid) ;
8405N/A+G_GNUC_INTERNAL void pretty_table_free (PrettyTable *pretty_table) ;
8405N/A
8405N/A #endif /* _PROCMAN_PRETTYTABLE_H_ */
8414N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procactions.c gnome-system-monitor-2.14.1.mod/src/procactions.c
8414N/A--- gnome-system-monitor-2.14.1/src/procactions.c 2005-12-01 23:46:20.000000000 +0800
8429N/A+++ gnome-system-monitor-2.14.1.mod/src/procactions.c 2006-07-21 17:00:44.270084000 +0800
8414N/A@@ -25,6 +25,8 @@
8414N/A #include <signal.h>
8414N/A #include <sys/time.h>
8414N/A #include <sys/resource.h>
8414N/A+#include <procfs.h>
8414N/A+#include <fcntl.h>
8414N/A #include "procactions.h"
8414N/A #include "procman.h"
8414N/A #include "proctable.h"
8429N/A@@ -111,12 +113,22 @@ kill_single_process (GtkTreeModel *model
8414N/A int error;
8414N/A int saved_errno;
8414N/A GtkWidget *dialog;
8414N/A-
8414N/A+ int fd;
8414N/A+ char buffer[BUFSIZ];
8414N/A+ struct pstatus *pstatus;
8414N/A+
8414N/A gtk_tree_model_get (model, iter, COL_POINTER, &info, -1);
8414N/A
8414N/A if (!info)
8414N/A return;
8414N/A-
8414N/A+ /*
8414N/A+ * If the process is a system process, we can't control it even as root
8414N/A+ */
8429N/A+ if ((args->signal == SIGTERM) || (args->signal == SIGKILL)){
8429N/A+ if (info->pid == 0)
8414N/A+ return;
8414N/A+ }
8414N/A+ /* if it is not a system process, we can kill it now */
8414N/A error = kill (info->pid, args->signal);
8414N/A
8414N/A /* success */
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procactions.h gnome-system-monitor-2.14.1.mod/src/procactions.h
8405N/A--- gnome-system-monitor-2.14.1/src/procactions.h 2005-12-01 21:06:34.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/procactions.h 2006-07-19 19:47:15.262213000 +0800
8405N/A@@ -21,8 +21,8 @@
8405N/A
8405N/A #include "procman.h"
8405N/A
8405N/A-void renice (ProcData *procdata, int nice) G_GNUC_INTERNAL;
8405N/A-void kill_process (ProcData *procdata, int sig) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void renice (ProcData *procdata, int nice) ;
8405N/A+G_GNUC_INTERNAL void kill_process (ProcData *procdata, int sig) ;
8405N/A
8405N/A #endif
8405N/A
8403N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procdialogs.c gnome-system-monitor-2.14.1.mod/src/procdialogs.c
8403N/A--- gnome-system-monitor-2.14.1/src/procdialogs.c 2006-04-10 01:19:39.000000000 +0800
8403N/A+++ gnome-system-monitor-2.14.1.mod/src/procdialogs.c 2006-07-08 02:26:05.271840000 +0800
8403N/A@@ -333,7 +333,7 @@ smooth_refresh_toggled(GtkToggleButton *
8403N/A
8403N/A gboolean toggled;
8403N/A
8403N/A- toggled = gtk_toggle_button_get_active(button);
8403N/A+ toggled = TRUE; /*gtk_toggle_button_get_active(button);*/
8403N/A
8403N/A gconf_client_set_bool(client, SMOOTH_REFRESH_KEY, toggled, NULL);
8403N/A }
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procdialogs.h gnome-system-monitor-2.14.1.mod/src/procdialogs.h
8405N/A--- gnome-system-monitor-2.14.1/src/procdialogs.h 2005-12-01 23:46:20.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/procdialogs.h 2006-07-19 19:47:52.878996000 +0800
8405N/A@@ -42,14 +42,14 @@ typedef enum
8405N/A } ProcmanActionType;
8405N/A
8405N/A
8405N/A-void procdialog_create_hide_dialog (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void procdialog_create_kill_dialog (ProcData *data, int signal) G_GNUC_INTERNAL;
8405N/A-void procdialog_create_renice_dialog (ProcData *data) G_GNUC_INTERNAL;
8405N/A-gboolean procdialog_create_root_password_dialog (ProcmanActionType type,
8405N/A+G_GNUC_INTERNAL void procdialog_create_hide_dialog (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void procdialog_create_kill_dialog (ProcData *data, int signal) ;
8405N/A+G_GNUC_INTERNAL void procdialog_create_renice_dialog (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL gboolean procdialog_create_root_password_dialog (ProcmanActionType type,
8405N/A ProcData *procdata,
8405N/A- gint pid, gint extra_value) G_GNUC_INTERNAL;
8405N/A-void procdialog_create_memmaps_dialog (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void procdialog_create_preferences_dialog (ProcData *data) G_GNUC_INTERNAL;
8405N/A+ gint pid, gint extra_value) ;
8405N/A+G_GNUC_INTERNAL void procdialog_create_memmaps_dialog (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void procdialog_create_preferences_dialog (ProcData *data) ;
8405N/A
8405N/A #endif
8405N/A
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/procman.h gnome-system-monitor-2.14.1.mod/src/procman.h
8405N/A--- gnome-system-monitor-2.14.1/src/procman.h 2006-03-25 16:35:49.000000000 +0800
8405N/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 };
8405N/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;
8405N/A-gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void procman_save_config (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;
8405N/A+G_GNUC_INTERNAL gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;
8405N/A
8405N/A
8405N/A
8403N/Adiff -Nrup gnome-system-monitor-2.14.1/src/proctable.c gnome-system-monitor-2.14.1.mod/src/proctable.c
8403N/A--- gnome-system-monitor-2.14.1/src/proctable.c 2006-02-27 17:44:35.000000000 +0800
8403N/A+++ gnome-system-monitor-2.14.1.mod/src/proctable.c 2006-07-19 18:47:48.938626000 +0800
8403N/A@@ -53,7 +53,6 @@
8403N/A #include "selinux.h"
8403N/A #include "e_date.h"
8403N/A
8403N/A-
8403N/A static guint64 total_time = 1;
8403N/A static guint64 total_time_last = 1;
8403N/A
8522N/A@@ -579,16 +579,17 @@
8403N/A wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
8403N/A info->pid,
8403N/A &xresources);
8403N/A+ info->memxserver = xresources.total_bytes_estimate;
8522N/A
8522N/A- glibtop_get_proc_mem(&procmem, info->pid);
8403N/A+ get_process_memory_writable(info);
8403N/A
8522N/A+ glibtop_get_proc_mem(&procmem, info->pid);
8403N/A info->vmsize = procmem.vsize;
8403N/A info->memres = procmem.resident;
8403N/A- info->memshared = procmem.share;
8522N/A
8403N/A- info->memxserver = xresources.total_bytes_estimate;
8522N/A-
8522N/A- get_process_memory_writable(info);
8403N/A+#ifdef __sun
8522N/A+ info->pcpu = procmem.load;
8403N/A+#endif
8403N/A
8522N/A info->mem = info->memxserver + info->memwritable;
8403N/A }
8403N/A@@ -795,15 +797,16 @@ update_info (ProcData *procdata, ProcInf
8403N/A glibtop_get_proc_uid (&procuid, info->pid);
8403N/A glibtop_get_proc_time (&proctime, info->pid);
8403N/A
8403N/A- get_process_memory_info(info);
8403N/A get_process_user(procdata, info, procstate.uid);
8403N/A-
8403N/A- info->pcpu = (proctime.rtime - info->cpu_time_last) * 100 / total_time;
8403N/A- info->pcpu = MIN(info->pcpu, 100);
8403N/A-
8403N/A- info->cpu_time_last = proctime.rtime;
8403N/A+ info->pcpu = (proctime.rtime - info->cpu_time_last) * 100 / total_time;
8403N/A+ info->pcpu = MIN(info->pcpu, 100);
8403N/A+
8403N/A+ /* there is a bug here, because info can't store cpu_time_last, it's only a temporary variable in refresh_list() */
8403N/A+ info->cpu_time_last = proctime.rtime;
8403N/A info->nice = procuid.nice;
8403N/A-
8403N/A+
8403N/A+ /* if at Solaris, in get_process_memory_info() info->pcpu will get again from glibtop_get_proc_mem() */
8403N/A+ get_process_memory_info(info);
8403N/A
8403N/A model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
8403N/A
8403N/A@@ -963,8 +966,9 @@ proctable_update_list (ProcData * const
8403N/A /* FIXME: total cpu time elapsed should be calculated on an individual basis here
8403N/A ** should probably have a total_time_last gint in the ProcInfo structure */
8403N/A glibtop_get_cpu (&cpu);
8403N/A- total_time = MAX(cpu.total - total_time_last, 1);
8403N/A- total_time_last = cpu.total;
8403N/A+ /* total is normally is 1/100 second, if transfer to second, have to divide by frequency */
8403N/A+ total_time = MAX(cpu.total / cpu.frequency - total_time_last, 1);
8403N/A+ total_time_last = cpu.total / cpu.frequency;
8403N/A
8403N/A refresh_list (procdata, pid_list, proclist.number);
8403N/A
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/proctable.h gnome-system-monitor-2.14.1.mod/src/proctable.h
8405N/A--- gnome-system-monitor-2.14.1/src/proctable.h 2005-12-27 23:28:53.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/proctable.h 2006-07-19 19:49:18.901282000 +0800
8405N/A@@ -47,19 +47,19 @@ enum
8405N/A };
8405N/A
8405N/A
8405N/A-GtkWidget* proctable_new (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void proctable_update_table (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void proctable_update_list (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void insert_info_to_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;
8405N/A-void remove_info_from_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;
8405N/A-ProcInfo * proctable_find_process (guint pid, ProcData *procdata) G_GNUC_INTERNAL;
8405N/A-void proctable_update_all (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void proctable_clear_tree (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void proctable_free_table (ProcData *data) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL GtkWidget* proctable_new (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void proctable_update_table (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void proctable_update_list (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void insert_info_to_tree (ProcInfo *info, ProcData *procdata) ;
8405N/A+G_GNUC_INTERNAL void remove_info_from_tree (ProcInfo *info, ProcData *procdata) ;
8405N/A+G_GNUC_INTERNAL ProcInfo * proctable_find_process (guint pid, ProcData *procdata) ;
8405N/A+G_GNUC_INTERNAL void proctable_update_all (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void proctable_clear_tree (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void proctable_free_table (ProcData *data) ;
8405N/A
8405N/A-GSList* proctable_get_columns_order(GtkTreeView *treeview) G_GNUC_INTERNAL;
8405N/A-void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL GSList* proctable_get_columns_order(GtkTreeView *treeview) ;
8405N/A+G_GNUC_INTERNAL void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) ;
8405N/A
8405N/A-char* make_loadavg_string(void) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL char* make_loadavg_string(void) ;
8405N/A
8405N/A #endif /* _PROCMAN_PROCTABLE_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/selinux.h gnome-system-monitor-2.14.1.mod/src/selinux.h
8405N/A--- gnome-system-monitor-2.14.1/src/selinux.h 2005-05-25 20:15:45.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/selinux.h 2006-07-19 19:49:34.954362000 +0800
8522N/A@@ -5,10 +5,10 @@
8405N/A
8522N/A #include "procman.h"
8405N/A
8405N/A-void
8405N/A-get_process_selinux_context (ProcInfo *info) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
8522N/A+get_process_selinux_context (ProcInfo *info);
8405N/A
8405N/A-gboolean
8522N/A-can_show_security_context_column (void) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL gboolean
8522N/A+can_show_security_context_column (void) G_GNUC_CONST;
8405N/A
8522N/A #endif /* PROCMAN_SELINUX_H_20050525 */
8403N/Adiff -Nrup gnome-system-monitor-2.14.1/src/smooth_refresh.c gnome-system-monitor-2.14.1.mod/src/smooth_refresh.c
8403N/A--- gnome-system-monitor-2.14.1/src/smooth_refresh.c 2005-12-28 00:14:59.000000000 +0800
8403N/A+++ gnome-system-monitor-2.14.1.mod/src/smooth_refresh.c 2006-07-19 18:47:58.412015000 +0800
8403N/A@@ -181,8 +181,10 @@ smooth_refresh_get(SmoothRefresh *sm, gu
8403N/A gboolean changed;
8403N/A float pcpu;
8403N/A
8403N/A- if (!sm->active)
8403N/A+ if (!sm->active){
8403N/A+ *new_interval = sm->interval;
8403N/A return FALSE;
8403N/A+ }
8403N/A
8403N/A pcpu = get_own_cpu_usage(sm);
8403N/A /*
8403N/A@@ -241,6 +243,8 @@ smooth_refresh_get(SmoothRefresh *sm, gu
8403N/A *sm->config_interval,
8403N/A ctime(&now));
8403N/A }
8403N/A+ else
8403N/A+ *new_interval = sm->interval;
8403N/A
8403N/A g_assert(sm->interval == *new_interval);
8403N/A g_assert(sm->interval >= *sm->config_interval);
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/smooth_refresh.h gnome-system-monitor-2.14.1.mod/src/smooth_refresh.h
8405N/A--- gnome-system-monitor-2.14.1/src/smooth_refresh.h 2005-12-28 00:14:59.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/smooth_refresh.h 2006-07-19 19:50:05.712418000 +0800
8405N/A@@ -18,8 +18,8 @@ typedef struct _SmoothRefresh SmoothRefr
8405N/A @return : initialized SmoothRefresh
8405N/A */
8405N/A
8405N/A-SmoothRefresh*
8405N/A-smooth_refresh_new(const guint * config_interval) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL SmoothRefresh*
8405N/A+smooth_refresh_new(const guint * config_interval) ;
8405N/A
8405N/A
8405N/A
8405N/A@@ -30,8 +30,8 @@ smooth_refresh_new(const guint * config_
8405N/A
8405N/A */
8405N/A
8405N/A-void
8405N/A-smooth_refresh_reset(SmoothRefresh *sm) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
8405N/A+smooth_refresh_reset(SmoothRefresh *sm) ;
8405N/A
8405N/A
8405N/A
8405N/A@@ -42,8 +42,8 @@ smooth_refresh_reset(SmoothRefresh *sm)
8405N/A
8405N/A */
8405N/A
8405N/A-void
8405N/A-smooth_refresh_destroy(SmoothRefresh *sm) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
8405N/A+smooth_refresh_destroy(SmoothRefresh *sm) ;
8405N/A
8405N/A
8405N/A
8405N/A@@ -59,8 +59,8 @@ smooth_refresh_destroy(SmoothRefresh *sm
8405N/A is stored in @new_interval. Else FALSE;
8405N/A */
8405N/A
8405N/A-gboolean
8405N/A-smooth_refresh_get(SmoothRefresh *sm, guint *new_interval) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL gboolean
8405N/A+smooth_refresh_get(SmoothRefresh *sm, guint *new_interval) ;
8405N/A
8405N/A
8405N/A #endif /* _PROCMAN_SMOOTH_REFRESH */
8405N/Adiff -Nrup gnome-system-monitor-2.14.1/src/util.h gnome-system-monitor-2.14.1.mod/src/util.h
8405N/A--- gnome-system-monitor-2.14.1/src/util.h 2005-08-05 02:45:17.000000000 +0800
8405N/A+++ gnome-system-monitor-2.14.1.mod/src/util.h 2006-07-19 19:50:38.877926000 +0800
8405N/A@@ -5,7 +5,7 @@
8405N/A #include <libgnomevfs/gnome-vfs-utils.h>
8405N/A #include <stddef.h>
8405N/A
8405N/A-void _procman_array_gettext_init(const char * strings[], size_t n) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void _procman_array_gettext_init(const char * strings[], size_t n) ;
8405N/A
8405N/A #define PROCMAN_GETTEXT_ARRAY_INIT(A) G_STMT_START { \
8405N/A static gboolean is_init = FALSE; \
8405N/A@@ -19,14 +19,14 @@ if(!is_init) { \
8405N/A #define PROCMAN_RCMP(X, Y) PROCMAN_CMP((Y), (X))
8405N/A
8405N/A
8405N/A-GtkWidget*
8405N/A+G_GNUC_INTERNAL GtkWidget*
8405N/A procman_make_label_for_mmaps_or_ofiles(const char *format,
8405N/A const char *process_name,
8405N/A- unsigned pid) G_GNUC_INTERNAL;
8405N/A+ unsigned pid) ;
8405N/A
8405N/A
8405N/A-gchar*
8405N/A-SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL gchar*
8405N/A+SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) ;
8405N/A
8405N/A
8405N/A #endif /* H_GNOME_SYSTEM_MONITOR_UTIL_1123178725 */
8522N/A@@ -29,11 +29,11 @@
8522N/A SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) ;
8522N/A
8522N/A
8522N/A-gboolean
8522N/A-load_symbols(const char *module, ...) G_GNUC_INTERNAL G_GNUC_NULL_TERMINATED;
8522N/A+G_GNUC_INTERNAL gboolean
8522N/A+load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED;
8522N/A
8522N/A
8522N/A-void
8522N/A-procman_debug(const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
8522N/A+G_GNUC_INTERNAL void
8522N/A+procman_debug(const char *format, ...) G_GNUC_PRINTF(1, 2);
8522N/A
8522N/A #endif /* H_GNOME_SYSTEM_MONITOR_UTIL_1123178725 */