16046N/Adiff -Nrup gnome-system-monitor-2.25.91/configure.in gnome-system-monitor-2.25.91.mod/configure.in

16046N/A--- gnome-system-monitor-2.25.91/configure.in 2009-02-17 02:07:36.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/configure.in 2009-03-04 10:31:31.831892000 +0800

16046N/A@@ -56,13 +56,13 @@ if test "$GCC" = "yes" -a "$set_more_war

16046N/A -Wcast-align -Wsign-compare \

16046N/A -std=gnu89 \

16046N/A $CFLAGS"

16046N/A- CXXFLAGS="-Wall -std=c++98 $CXXFLAGS"

16046N/A+ CXXFLAGS="-Wall -std=c++98 $CXXFLAGS -features=extensions"

16046N/A else

16046N/A AC_MSG_RESULT(no)

16046N/A fi

8405N/A

16046N/A-dnl CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden $CXXFLAGS"

16046N/A-dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS"

16046N/A+dnl CXXFLAGS="-fvisibility=hidden -fvisibility-inlines-hidden -features=extensions $CXXFLAGS"

16046N/A+dnl CXXFLAGS="-fvisibility-inlines-hidden -features=extensions $CXXFLAGS"

16046N/A

16046N/A AM_GCONF_SOURCE_2

8922N/A

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/load-graph.cpp gnome-system-monitor-2.25.91.mod/src/load-graph.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/load-graph.cpp 2008-08-31 21:29:57.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/load-graph.cpp 2009-03-04 11:26:07.230508000 +0800

16046N/A@@ -435,7 +435,7 @@ net_scale (LoadGraph *g, unsigned din, u

16046N/A }

16046N/A }

8922N/A

16046N/A- procman_debug("rescale dmax = %u max = %u new_max = %u", dmax, g->net.max, new_max);

16046N/A+ //procman_debug("rescale dmax = %u max = %u new_max = %u", dmax, g->net.max, new_max);

9595N/A

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

8405N/A

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/lsof.cpp gnome-system-monitor-2.25.91.mod/src/lsof.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/lsof.cpp 2008-05-24 05:44:00.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/lsof.cpp 2009-03-04 10:16:57.082704000 +0800

16046N/A@@ -95,13 +95,13 @@ namespace

16046N/A

16046N/A GUI()

16046N/A {

16046N/A- procman_debug("New Lsof GUI %p", this);

16046N/A+ //procman_debug("New Lsof GUI %p", this);

16046N/A }

16046N/A

16046N/A

16046N/A ~GUI()

16046N/A {

16046N/A- procman_debug("Destroying Lsof GUI %p", this);

16046N/A+ //procman_debug("Destroying Lsof GUI %p", this);

16046N/A }

8405N/A

8405N/A

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/openfiles.cpp gnome-system-monitor-2.25.91.mod/src/openfiles.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/openfiles.cpp 2008-09-12 03:55:34.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/openfiles.cpp 2009-03-04 11:54:44.460430000 +0800

16046N/A@@ -67,7 +67,7 @@ friendlier_hostname(const char *addr_str

16046N/A goto failsafe;

8405N/A

16046N/A if (getnameinfo(res->ai_addr, res->ai_addrlen, hostname,

16046N/A- sizeof hostname, service, sizeof service, NI_IDN))

16046N/A+ sizeof hostname, service, sizeof service, NI_MAXSERV))

16046N/A goto failsafe;

8405N/A

16046N/A if (res) freeaddrinfo(res);

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/prettytable.cpp gnome-system-monitor-2.25.91.mod/src/prettytable.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/prettytable.cpp 2009-01-19 02:01:09.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/prettytable.cpp 2009-03-04 10:17:07.130460000 +0800

16046N/A@@ -77,7 +77,7 @@ PrettyTable::register_application(pid_t

16046N/A info->set_icon(icon);

16046N/A // move the ref to the map

16046N/A this->apps[pid] = icon;

16046N/A- procman_debug("WNCK OK for %u", unsigned(pid));

16046N/A+ //procman_debug("WNCK OK for %u", unsigned(pid));

16046N/A }

16046N/A }

8405N/A

16046N/A@@ -229,7 +229,7 @@ PrettyTable::set_icon(ProcInfo &info)

16046N/A getters.push_back(&PrettyTable::get_icon_from_name);

16046N/A if (has_kthreadd())

16046N/A {

16046N/A- procman_debug("kthreadd is running with PID 2");

16046N/A+ //procman_debug("kthreadd is running with PID 2");

16046N/A getters.push_back(&PrettyTable::get_icon_for_kernel);

16046N/A }

16046N/A getters.push_back(&PrettyTable::get_icon_dummy);

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/procactions.cpp gnome-system-monitor-2.25.91.mod/src/procactions.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/procactions.cpp 2007-01-03 06:15:36.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/procactions.cpp 2009-02-22 19:58:20.190256000 +0800

16046N/A@@ -128,6 +128,15 @@ kill_single_process (GtkTreeModel *model

8414N/A if (!info)

8414N/A return;

16046N/A

8414N/A+ /*

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

8922N/A+ */

8922N/A+ if ((args->signal == SIGTERM) || (args->signal == SIGKILL)){

8922N/A+ if (info->pid == 0)

8922N/A+ return;

8922N/A+ }

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

16046N/A+

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

8414N/A

16046N/A /* success */

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/procdialogs.cpp gnome-system-monitor-2.25.91.mod/src/procdialogs.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/procdialogs.cpp 2008-05-24 05:44:00.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/procdialogs.cpp 2009-03-04 10:17:21.908309000 +0800

16046N/A@@ -342,7 +342,7 @@ private:

16046N/A g_error_free(e);

16046N/A }

8405N/A

16046N/A- procman_debug("set %s to %d", this->gconf_key.c_str(), new_value);

16046N/A+ //procman_debug("set %s to %d", this->gconf_key.c_str(), new_value);

16046N/A }

8405N/A

16046N/A const string gconf_key;

16046N/A@@ -659,7 +659,10 @@ procdialog_create_preferences_dialog (Pr

9799N/A gtk_box_pack_start (GTK_BOX (hbox2), hbox3, TRUE, TRUE, 0);

9799N/A

9799N/A update = (gfloat) procdata->config.graph_update_interval;

9799N/A- adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,

9799N/A+ /* The interval is too small, and in some low level machine,

9799N/A+ cause gconf can't work, so set its min value 1 sec*/

9799N/A+ /*adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,*/

9799N/A+ adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 1,

9799N/A 100.0, 0.25, 1.0, 1.0);

9799N/A spin_button = gtk_spin_button_new (adjustment, 1.0, 2);

9799N/A g_signal_connect (G_OBJECT (spin_button), "focus_out_event",

16046N/A@@ -803,7 +806,7 @@ procdialog_create_root_password_dialog(P

8405N/A

16046N/A command = procman_action_to_command(type, pid, extra_value);

16046N/A

16046N/A- procman_debug("Trying to run '%s' as root", command);

16046N/A+ //procman_debug("Trying to run '%s' as root", command);

8405N/A

16046N/A if (procman_has_gksu())

16046N/A ret = procman_gksu_create_root_password_dialog(command);

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/procman.cpp gnome-system-monitor-2.25.91.mod/src/procman.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/procman.cpp 2009-01-03 20:06:10.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/procman.cpp 2009-03-04 10:22:32.037096000 +0800

16046N/A@@ -147,7 +147,10 @@ timeouts_changed_cb (GConfClient *client

8922N/A procdata->config.graph_update_interval = gconf_value_get_int (value);

8922N/A procdata->config.graph_update_interval =

8922N/A MAX (procdata->config.graph_update_interval,

8922N/A- 250);

9370N/A+ /* The interval is too small, and in some low level machine,

9370N/A+ cause gconf can't work, so set its min value 1 sec*/

9370N/A+ /* 250);*/

9370N/A+ 1000);

8922N/A load_graph_change_speed(procdata->cpu_graph,

8922N/A procdata->config.graph_update_interval);

8922N/A load_graph_change_speed(procdata->mem_graph,

16046N/A@@ -332,10 +335,14 @@ procman_data_new (GConfClient *client)

9869N/A /* Sanity checks */

9869N/A swidth = gdk_screen_width ();

9869N/A sheight = gdk_screen_height ();

9869N/A- pd->config.width = CLAMP (pd->config.width, 50, swidth);

9869N/A- pd->config.height = CLAMP (pd->config.height, 50, sheight);

9874N/A+ pd->config.width = CLAMP (pd->config.width, 50, swidth-2); /* there is a bug in gtk I think, when the width/height

16046N/A+ become the biggest, the windows alway biggest, so -2 */

9869N/A+ pd->config.height = CLAMP (pd->config.height, 50, sheight-2);

8922N/A pd->config.update_interval = MAX (pd->config.update_interval, 1000);

8922N/A- pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);

9370N/A+ /* The interval is too small, and in some low level machine,

8922N/A+ cause gconf can't work, so set its min value 1 sec*/

9370N/A+ /*pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);*/

9370N/A+ pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 1000);

8922N/A pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000);

8922N/A pd->config.whose_process = CLAMP (pd->config.whose_process, 0, 2);

9370N/A pd->config.current_tab = CLAMP(pd->config.current_tab,

16046N/A@@ -598,9 +605,9 @@ cb_server (const gchar *msg, gpointer us

16046N/A procdata = *(ProcData**)user_data;

16046N/A g_assert (procdata != NULL);

16046N/A

16046N/A- procman_debug("cb_server(%s)", msg);

16046N/A+ //procman_debug("cb_server(%s)", msg);

16046N/A if (msg != NULL && procman::SHOW_SYSTEM_TAB_CMD == msg) {

16046N/A- procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message");

16046N/A+ //procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message");

16046N/A gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);

16046N/A cb_change_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);

16046N/A } else

16046N/A@@ -677,7 +684,7 @@ main (int argc, char *argv[])

16046N/A

16046N/A Gio::init();

16046N/A Gtk::Main kit(&argc, &argv);

16046N/A- procman_debug("post gtk_init");

16046N/A+ //procman_debug("post gtk_init");

16046N/A

16046N/A conn = bacon_message_connection_new ("gnome-system-monitor");

16046N/A if (!conn) g_error("Couldn't connect to gnome-system-monitor");

16046N/A@@ -715,14 +722,14 @@ main (int argc, char *argv[])

16046N/A

16046N/A glibtop_init ();

8405N/A

16046N/A- procman_debug("end init");

16046N/A+ //procman_debug("end init");

16046N/A

16046N/A procdata = procman_data_new (client);

16046N/A procdata->client = client;

16046N/A

16046N/A- procman_debug("begin create_main_window");

16046N/A+ //procman_debug("begin create_main_window");

16046N/A create_main_window (procdata);

16046N/A- procman_debug("end create_main_window");

16046N/A+ //procman_debug("end create_main_window");

16046N/A

16046N/A // proctable_update_all (procdata);

16046N/A

16046N/A@@ -731,14 +738,14 @@ main (int argc, char *argv[])

16046N/A g_assert(procdata->app);

16046N/A

16046N/A if (option_group.show_system_tab) {

16046N/A- procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");

16046N/A+ //procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");

16046N/A gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);

16046N/A cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);

16046N/A }

16046N/A

16046N/A gtk_widget_show(procdata->app);

16046N/A

16046N/A- procman_debug("begin gtk_main");

16046N/A+ //procman_debug("begin gtk_main");

16046N/A kit.run();

16046N/A

16046N/A procman_free_data (procdata);

16776N/Adiff -Nrup gnome-system-monitor-2.26.2/src/proctable.cpp gnome-system-monitor-2.26.2/src/proctable.cpp

16776N/A--- gnome-system-monitor-2.26.2/src/proctable.cpp 2009-07-15 15:18:15.325964805 +0800

16776N/A+++ gnome-system-monitor-2.26.2/src/proctable.cpp 2009-07-15 15:40:34.315280700 +0800

16046N/A@@ -197,7 +197,7 @@ search_equal_func(GtkTreeModel *model,

8405N/A

8405N/A

16046N/A GtkWidget *

16046N/A-proctable_new (ProcData * const procdata)

16046N/A+proctable_new (ProcData * procdata)

16046N/A {

16046N/A GtkWidget *proctree;

16046N/A GtkWidget *scrolled;

16046N/A@@ -487,6 +487,18 @@ static void get_process_memory_writable(

16046N/A glibtop_proc_map buf;

16046N/A glibtop_map_entry *maps;

8405N/A

9311N/A+ /* we have to optimize the performance of libgtop, because update the information will occupy too much cpu.

9311N/A+

9311N/A+ here I would like to make a little update:set glibtop_proc_map.flags=1,so as to let glibtop_get_proc_map_s()

9311N/A+ only return the ones this function need: memwritable

9311N/A+

9311N/A+ we do the check in glibtop_get_proc_map_s(), don't run the others part which don't need by this function,

9311N/A+ I think this will accelerate the transaction lots,

9311N/A+ Also this will not affect the existing codes, because when nobody set glibtop_proc_map.flags,

9311N/A+ glibtop_get_proc_map() will return all as before. zhua

9311N/A+ */

9311N/A+ buf.flags = 1;

9822N/A+

9311N/A maps = glibtop_get_proc_map(&buf, info->pid);

9311N/A

16046N/A gulong memwritable = 0;

16046N/A@@ -498,6 +510,9 @@ static void get_process_memory_writable(

9799N/A #else

9799N/A if (maps[i].perm & GLIBTOP_MAP_PERM_WRITE)

16046N/A memwritable += maps[i].size;

9799N/A+

9799N/A+ if (maps[i].perm & GLIBTOP_MAP_PERM_SHARED)

9799N/A+ info->memshared += maps[i].shared_clean;

9799N/A #endif

9799N/A }

9799N/A

16776N/A@@ -570,7 +585,7 @@ insert_info_to_tree (ProcInfo *info, Pro

16776N/A

16776N/A ProcInfo *parent = 0;

9799N/A

16776N/A- if (not forced)

16776N/A+ if (not forced && info->pid != 0)

16776N/A parent = ProcInfo::find(info->ppid);

16046N/A

16776N/A if (parent) {

16776N/A@@ -597,7 +612,7 @@ insert_info_to_tree (ProcInfo *info, Pro

16046N/A

16046N/A procdata->pretty_table.set_icon(*info);

16046N/A

16046N/A- procman_debug("inserted %d%s", info->pid, (forced ? " (forced)" : ""));

16046N/A+ //procman_debug("inserted %d%s", info->pid, (forced ? " (forced)" : ""));

8922N/A }

8522N/A

16046N/A

16776N/A@@ -612,12 +627,12 @@ remove_info_from_tree (ProcData *procdat

16046N/A GtkTreeIter child_node;

16046N/A

16046N/A if (std::find(orphans.begin(), orphans.end(), current) != orphans.end()) {

16046N/A- procman_debug("[%u] %d already removed from tree", lvl, int(current->pid));

16046N/A+ //procman_debug("[%u] %d already removed from tree", lvl, int(current->pid));

16046N/A return;

16046N/A }

8522N/A

16046N/A- procman_debug("[%u] pid %d, %d children", lvl, int(current->pid),

16046N/A- gtk_tree_model_iter_n_children(model, &current->node));

16046N/A+ //procman_debug("[%u] pid %d, %d children", lvl, int(current->pid),

16046N/A+ // gtk_tree_model_iter_n_children(model, &current->node));

16046N/A

16046N/A // it is not possible to iterate&erase over a treeview so instead we

16046N/A // just pop one child after another and recursively remove it and

16776N/A@@ -757,7 +772,7 @@ refresh_list (ProcData *procdata, const

16046N/A ++next;

9799N/A

16046N/A if (pids.find(info->pid) == pids.end()) {

16046N/A- procman_debug("ripping %d", info->pid);

16046N/A+ //procman_debug("ripping %d", info->pid);

16046N/A remove_info_from_tree(procdata, model, info, addition);

16046N/A addition.remove(info);

16046N/A ProcInfo::all.erase(it);

16776N/A@@ -785,12 +800,12 @@ refresh_list (ProcData *procdata, const

10760N/A

10760N/A

16046N/A while (not addition.empty()) {

16046N/A- procman_debug("looking for %d parents", int(addition.size()));

16046N/A+ //procman_debug("looking for %d parents", int(addition.size()));

16046N/A ProcList::iterator it(addition.begin());

16046N/A

16046N/A while (it != addition.end()) {

16046N/A- procman_debug("looking for %d's parent with ppid %d",

16046N/A- int((*it)->pid), int((*it)->ppid));

16046N/A+ //procman_debug("looking for %d's parent with ppid %d",

16046N/A+ //int((*it)->pid), int((*it)->ppid));

16046N/A

16046N/A

16046N/A // inserts the process in the treeview if :

16776N/A@@ -895,7 +910,7 @@ proctable_update_list (ProcData * const

8405N/A

9799N/A

16046N/A void

16046N/A-proctable_update_all (ProcData * const procdata)

16046N/A+proctable_update_all (ProcData * procdata)

16046N/A {

16046N/A char* string;

8405N/A

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/selection.cpp gnome-system-monitor-2.25.91.mod/src/selection.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/selection.cpp 2007-06-30 02:28:26.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/selection.cpp 2009-03-04 12:00:41.995124000 +0800

16046N/A@@ -33,10 +33,10 @@ namespace procman

16046N/A if (ProcInfo* proc = ProcInfo::find(*it))

16046N/A {

16046N/A gtk_tree_selection_select_iter(selection, &proc->node);

16046N/A- procman_debug("Re-selected process %u", unsigned(*it));

16046N/A+ //procman_debug("Re-selected process %u", unsigned(*it));

16046N/A }

16046N/A- else

16046N/A- procman_debug("Could not find process %u, cannot re-select it", unsigned(*it));

16046N/A+ //else

16046N/A+ //procman_debug("Could not find process %u, cannot re-select it", unsigned(*it));

16046N/A }

16046N/A }

16046N/A }

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/smooth_refresh.cpp gnome-system-monitor-2.25.91.mod/src/smooth_refresh.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/smooth_refresh.cpp 2009-01-19 02:16:39.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/smooth_refresh.cpp 2009-03-04 11:31:10.615230000 +0800

16046N/A@@ -65,7 +65,7 @@ void SmoothRefresh::load_gconf_value(GCo

16046N/A this->active = value ? gconf_value_get_bool(value) : KEY_DEFAULT_VALUE;

8405N/A

16046N/A if (this->active)

16046N/A- procman_debug("smooth_refresh is enabled");

16046N/A+ //procman_debug("smooth_refresh is enabled");

8405N/A

16046N/A if (own_value and value)

16046N/A gconf_value_free(value);

16046N/A@@ -159,10 +159,10 @@ SmoothRefresh::get(guint &new_interval)

8405N/A

8405N/A

16046N/A if (changed) {

16046N/A- procman_debug("CPU usage is %3u%%, changed refresh_interval to %u (config %u)",

16046N/A+ /*procman_debug("CPU usage is %3u%%, changed refresh_interval to %u (config %u)",

16046N/A this->last_pcpu,

16046N/A this->interval,

16046N/A- config_interval);

16046N/A+ config_interval);*/

16046N/A }

8522N/A

16046N/A g_assert(this->interval == new_interval);

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/sysinfo.cpp gnome-system-monitor-2.25.91.mod/src/sysinfo.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/sysinfo.cpp 2009-01-21 05:13:28.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/sysinfo.cpp 2009-03-04 10:18:54.373979000 +0800

16046N/A@@ -273,7 +273,7 @@ namespace {

16046N/A channel->close();

16046N/A Glib::spawn_close_pid(pid);

16046N/A

16046N/A- procman_debug("lsb_release output = '%s'", content.c_str());

16046N/A+ //procman_debug("lsb_release output = '%s'", content.c_str());

8522N/A

16046N/A string release, codename;

16046N/A std::istringstream input(content);

16046N/Adiff -Nrup gnome-system-monitor-2.25.91/src/util.cpp gnome-system-monitor-2.25.91.mod/src/util.cpp

16046N/A--- gnome-system-monitor-2.25.91/src/util.cpp 2009-02-17 02:21:44.000000000 +0800

16046N/A+++ gnome-system-monitor-2.25.91.mod/src/util.cpp 2009-03-04 10:21:38.634398000 +0800

16046N/A@@ -192,7 +192,7 @@ load_symbols(const char *module, ...)

16046N/A if (!mod)

16046N/A return FALSE;

8522N/A

16046N/A- procman_debug("Found %s", module);

16046N/A+ //procman_debug("Found %s", module);

16046N/A

16046N/A va_start(args, module);

8522N/A

16046N/A@@ -208,10 +208,10 @@ load_symbols(const char *module, ...)

16046N/A symbol = va_arg(args, void**);

8522N/A

16046N/A if (g_module_symbol(mod, name, symbol)) {

16046N/A- procman_debug("Loaded %s from %s", name, module);

16046N/A+ //procman_debug("Loaded %s from %s", name, module);

16046N/A }

16046N/A else {

16046N/A- procman_debug("Could not load %s from %s", name, module);

16046N/A+ //procman_debug("Could not load %s from %s", name, module);

16046N/A found_all = FALSE;

16046N/A break;

16046N/A }

16346N/Adiff -Nrup gnome-system-monitor-2.26.0/src/util.h gnome-system-monitor-2.26.0-new/src/util.h

16346N/A--- gnome-system-monitor-2.26.0/src/util.h 2009-02-27 21:50:16.000000000 +0000

16346N/A+++ gnome-system-monitor-2.26.0-new/src/util.h 2009-04-09 13:50:15.164866011 +0100

16346N/A@@ -46,7 +46,7 @@ procman_debug_real(const char *file, int

16346N/A inline string make_string(char *c_str)

16346N/A {

16346N/A if (!c_str) {

16346N/A- procman_debug("NULL string");

16346N/A+ //procman_debug("NULL string");

16346N/A return string();

16346N/A }