Hello community,
here is the log from the commit of package gnome-system-monitor for openSUSE:Factory
checked in at Sat Feb 7 01:13:15 CET 2009.
--------
--- GNOME/gnome-system-monitor/gnome-system-monitor.changes 2009-01-08 00:52:50.000000000 +0100
+++ gnome-system-monitor/gnome-system-monitor.changes 2009-02-03 17:42:26.000000000 +0100
@@ -1,0 +2,20 @@
+Tue Feb 3 11:29:10 EST 2009 - hfiguiere@suse.de
+
+- Update gnome-system-monitor-fate302198.diff to fix slow startup.
+ (bnc#447370)
+
+-------------------------------------------------------------------
+Sun Feb 1 17:37:47 EST 2009 - mboman@suse.de
+
+- Update to version 2.24.4:
+ + Fixed license: system-monitor is GPL-2
+ + Fixed small memory leak
+- Updated gnome-system-monitor-bgo566962-leaks.diff. Partly fixed
+ upstream
+
+-------------------------------------------------------------------
+Fri Jan 23 05:52:51 CET 2009 - vuntz@novell.com
+
+- Requires lsb (change was done by Magnus Boman, iirc).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-system-monitor-2.24.1.tar.bz2
New:
----
gnome-system-monitor-2.24.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-system-monitor.spec ++++++
--- /var/tmp/diff_new_pack.U19487/_old 2009-02-07 01:07:50.000000000 +0100
+++ /var/tmp/diff_new_pack.U19487/_new 2009-02-07 01:07:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-system-monitor (Version 2.24.1)
+# spec file for package gnome-system-monitor (Version 2.24.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -43,8 +43,8 @@
BuildRequires: hal-devel hwinfo-devel
License: GPL v2 or later
Group: System/GUI/GNOME
-Version: 2.24.1
-Release: 2
+Version: 2.24.4
+Release: 1
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM bgo#566962 - hfiguiere@novell.com
Patch0: gnome-system-monitor-bgo566962-leaks.diff
@@ -57,6 +57,7 @@
Summary: A Simple Process Monitor
Requires: gnome-icon-theme
Requires: %{name}-lang = %{version}
+Requires: lsb
%gconf_schemas_prereq
%description
@@ -116,6 +117,17 @@
%files lang -f %{name}.lang
%changelog
+* Tue Feb 03 2009 hfiguiere@suse.de
+- Update gnome-system-monitor-fate302198.diff to fix slow startup.
+ (bnc#447370)
+* Sun Feb 01 2009 mboman@suse.de
+- Update to version 2.24.4:
+ + Fixed license: system-monitor is GPL-2
+ + Fixed small memory leak
+- Updated gnome-system-monitor-bgo566962-leaks.diff. Partly fixed
+ upstream
+* Thu Jan 22 2009 vuntz@novell.com
+- Requires lsb (change was done by Magnus Boman, iirc).
* Wed Jan 07 2009 hfiguiere@suse.de
- Add gnome-system-monitor-bgo566962-leaks.diff
* Fix memory leaks (bgo#566962)
++++++ gnome-system-monitor-2.24.1.tar.bz2 -> gnome-system-monitor-2.24.4.tar.bz2 ++++++
++++ 7881 lines of diff (skipped)
++++++ gnome-system-monitor-bgo566962-leaks.diff ++++++
--- /var/tmp/diff_new_pack.U19487/_old 2009-02-07 01:07:52.000000000 +0100
+++ /var/tmp/diff_new_pack.U19487/_new 2009-02-07 01:07:52.000000000 +0100
@@ -70,18 +70,4 @@
tree_store_update(model, &info->node, COL_VMSIZE, info->vmsize);
tree_store_update(model, &info->node, COL_MEMRES, info->memres);
tree_store_update(model, &info->node, COL_MEMWRITABLE, info->memwritable);
-Index: src/util.cpp
-===================================================================
---- src/util.cpp (revision 2544)
-+++ src/util.cpp (working copy)
-@@ -462,7 +462,9 @@
- {
- char* bytes = procman::format_size(rate, max_rate);
- // xgettext: rate, 10MiB/s
-- return make_string(g_strdup_printf(_("%s/s"), bytes));
-+ std::string formatted_rate(make_string(g_strdup_printf(_("%s/s"), bytes)));
-+ g_free(bytes);
-+ return formatted_rate;
- }
- }
++++++ gnome-system-monitor-fate302198.diff ++++++
--- /var/tmp/diff_new_pack.U19487/_old 2009-02-07 01:07:52.000000000 +0100
+++ /var/tmp/diff_new_pack.U19487/_new 2009-02-07 01:07:52.000000000 +0100
@@ -1,8 +1,8 @@
Index: configure.in
===================================================================
---- configure.in (revision 2495)
-+++ configure.in (working copy)
-@@ -37,7 +37,7 @@
+--- configure.in.orig
++++ configure.in
+@@ -37,7 +37,7 @@ LIBXML_REQUIRED=2.0
RSVG_REQUIRED=2.12
DBUS_REQUIRED=0.7
@@ -13,8 +13,8 @@
AC_ARG_ENABLE(more-warnings,
Index: src/hardware.h
===================================================================
---- src/hardware.h (revision 0)
-+++ src/hardware.h (revision 0)
+--- /dev/null
++++ src/hardware.h
@@ -0,0 +1,32 @@
+/* Gnome System Monitor - hardware.h
+ * Copyright (C) 2008 Novell, Inc.
@@ -50,9 +50,9 @@
+#endif
Index: src/hardware.cpp
===================================================================
---- src/hardware.cpp (revision 0)
-+++ src/hardware.cpp (revision 0)
-@@ -0,0 +1,285 @@
+--- /dev/null
++++ src/hardware.cpp
+@@ -0,0 +1,293 @@
+/* Gnome System Monitor - hardware.cpp
+ * Copyright (C) 2008 Novell, Inc.
+ *
@@ -78,6 +78,7 @@
+#include
+#include
+
++#include
+#include
+
+#include
@@ -152,7 +153,7 @@
+ { hw_wlan, "", _("WLAN Interface") },
+ { hw_redasd, "", "redasd??" },
+ { hw_dsl, "", _("DSL Modem") },
-+ { hw_block, "", _("Block Device") },
++ { hw_block, "", _("Block Device") },
+ { hw_tape, "media-tape", _("Tape Drive") },
+ { hw_vbe, "", _("vbe???") },
+ { hw_bluetooth, "", _("Bluetooth Device") },
@@ -195,19 +196,21 @@
+ hw_map_t::const_iterator iter = hw_map.find(hwclass);
+ if(iter != hw_map.end() && iter->second && iter->second->icon
+ && *iter->second->icon) {
-+ pixbuf = icon_theme->load_icon(iter->second->icon, 16,
++ pixbuf = icon_theme->load_icon(iter->second->icon, 16,
+ Gtk::ICON_LOOKUP_USE_BUILTIN);
+ }
-+
++
+ return pixbuf;
+}
+
-+
++static
+void populate_hardware_view(GtkTreeStore * model)
+{
+ hd_data_t *hd_data;
+ hd_t *hd;
+
++ g_object_freeze_notify(G_OBJECT(model));
++
+ std::map item_map;
+ std::listGtk::TreeIter unparented;
+ hd_data = (hd_data_t *)calloc(1, sizeof *hd_data);
@@ -227,15 +230,15 @@
+ parent = iter->second.gobj();
+ }
+ }
-+
++
+ Glib::RefPtrGdk::Pixbuf pixbuf = get_hardware_icon(iclass);
+ const char * device_type = get_hardware_type(iclass);
+ if(name && *name) {
+ Gtk::TreeIter iter;
+ gtk_tree_store_append(model, iter.gobj(), parent);
-+ gtk_tree_store_set(model, iter.gobj(), HW_DEVICE, name,
++ gtk_tree_store_set(model, iter.gobj(), HW_DEVICE, name,
+ HW_ICON, pixbuf ? pixbuf->gobj() : NULL,
-+ HW_TYPE, device_type ? device_type : "",
++ HW_TYPE, device_type ? device_type : "",
+ -1);
+ item_map[hd->unique_id] = iter;
+ if(hd->parent_id && !parent) {
@@ -252,11 +255,14 @@
+ // reparent
+ unparented.pop_front();
+ }
-+
++
+
+ hd_free_hd_list(hd); /* free it */
+ hd_free_hd_data(hd_data);
+ free(hd_data);
++ free(hd);
++ g_object_thaw_notify(G_OBJECT(model));
++ g_object_unref(model);
+}
+
+
@@ -317,7 +323,7 @@
+ gtk_tree_view_column_set_reorderable(col, TRUE);
+ gtk_tree_view_column_set_resizable(col, TRUE);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(hw_tree), col);
-+
++
+ /* type */
+ col = gtk_tree_view_column_new();
+ cell = gtk_cell_renderer_text_new();
@@ -330,7 +336,9 @@
+ gtk_tree_view_column_set_resizable(col, TRUE);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(hw_tree), col);
+
-+ populate_hardware_view(model);
++ if(!Glib::thread_supported())
++ Glib::thread_init();
++ Glib::Thread::create(sigc::bind(&populate_hardware_view, GTK_TREE_STORE(g_object_ref(model))), false);
+
+ gtk_widget_show_all(vbox);
+
@@ -340,8 +348,8 @@
+
Index: src/interface.cpp
===================================================================
---- src/interface.cpp (revision 2495)
-+++ src/interface.cpp (working copy)
+--- src/interface.cpp.orig
++++ src/interface.cpp
@@ -1,5 +1,6 @@
/* Procman - main window
* Copyright (C) 2001 Kevin Vandersloot
@@ -357,7 +365,7 @@
static void cb_toggle_tree (GtkAction *action, gpointer data);
-@@ -610,9 +612,9 @@
+@@ -610,9 +612,9 @@ create_main_window (ProcData *procdata)
GtkWidget *menubar;
GtkWidget *main_box;
GtkWidget *notebook;
@@ -369,7 +377,7 @@
GtkWidget *sysinfo_box, *sysinfo_label;
app = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-@@ -702,6 +704,10 @@
+@@ -702,6 +704,10 @@ create_main_window (ProcData *procdata)
tab_label3 = gtk_label_new (_("File Systems"));
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), devices_box, tab_label3);
@@ -382,9 +390,9 @@
g_signal_connect (G_OBJECT (notebook), "change-current-page",
Index: src/Makefile.am
===================================================================
---- src/Makefile.am (revision 2495)
-+++ src/Makefile.am (working copy)
-@@ -24,6 +24,7 @@
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -24,6 +24,7 @@ gnome_system_monitor_SOURCES = \
smooth_refresh.cpp smooth_refresh.h \
defaulttable.h \
disks.cpp disks.h \
@@ -394,8 +402,8 @@
procman_gksu.h procman_gksu.cpp \
Index: src/sysinfo.cpp
===================================================================
---- src/sysinfo.cpp (revision 2495)
-+++ src/sysinfo.cpp (working copy)
+--- src/sysinfo.cpp.orig
++++ src/sysinfo.cpp
@@ -13,6 +13,8 @@
#include
#include
@@ -405,11 +413,11 @@
#include
#include
#include
-@@ -36,6 +38,18 @@
+@@ -36,6 +38,18 @@ using std::vector;
namespace {
-+ string get_hal_property(LibHalContext * ctx, const char *udi, const char *prop_name,
++ string get_hal_property(LibHalContext * ctx, const char *udi, const char *prop_name,
+ DBusError * error)
+ {
+ string prop_val;
@@ -424,7 +432,7 @@
class SysInfo
{
-@@ -51,6 +65,12 @@
+@@ -51,6 +65,12 @@ namespace {
guint n_processors;
vector<string> processors;
@@ -437,7 +445,7 @@
SysInfo()
{
-@@ -59,6 +79,7 @@
+@@ -59,6 +79,7 @@ namespace {
this->load_disk_info();
this->load_uname_info();
this->load_gnome_version();
@@ -445,7 +453,7 @@
}
virtual ~SysInfo()
-@@ -182,6 +203,45 @@
+@@ -182,6 +203,49 @@ namespace {
this->gnome_version = values[0] + '.' + values[1] + '.' + values[2];
}
@@ -465,23 +473,27 @@
+ libhal_ctx_set_dbus_connection (ctx, connection);
+ if(!libhal_ctx_init (ctx, &error)) {
+ printf("ctx init failed\n");
++ if (dbus_error_is_set (&error)) {
++ dbus_error_free (&error);
++ return;
++ }
+ }
+
-+ this->bios_version = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
-+ "system.firmware.version", &error);
-+ this->bios_date = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
-+ "system.firmware.release_date", &error);
++ this->bios_version = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
++ "system.firmware.version", NULL);
++ this->bios_date = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
++ "system.firmware.release_date", NULL);
+ this->machine_type_model = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
-+ "system.product", &error);
++ "system.product", NULL);
+ if(this->machine_type_model.empty()) {
+ dbus_error_init(&error);
+ this->machine_type_model = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
-+ "system.hardware.product", &error);
++ "system.hardware.product", NULL);
+ }
+ this->system_serial = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
-+ "system.hardware.serial", &error);
++ "system.hardware.serial", NULL);
+ this->system_board_serial = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
-+ "system.hardware.uuid", &error);
++ "system.hardware.uuid", NULL);
+
+ libhal_ctx_shutdown (ctx, &error);
+ libhal_ctx_free(ctx);
@@ -491,7 +503,7 @@
};
-@@ -485,6 +545,10 @@
+@@ -485,6 +549,10 @@ procman_create_sysinfo_view(void)
GtkWidget *memory_label;
GtkWidget *processor_label;
@@ -502,19 +514,19 @@
GtkWidget *disk_space_table;
GtkWidget *disk_space_label;
-@@ -571,17 +635,20 @@
+@@ -571,17 +639,20 @@ procman_create_sysinfo_view(void)
/* hardware section */
- markup = g_strdup_printf(_("<b>Hardware</b>"));
- hardware_table = add_section(GTK_BOX(vbox), markup, data->processors.size(), 2, NULL);
- g_free(markup);
-+ hardware_table = add_section(GTK_BOX(vbox), _("<b>Hardware</b>"),
++ hardware_table = add_section(GTK_BOX(vbox), _("<b>Hardware</b>"),
+ data->processors.size() + 4, 2, NULL);
-
-+ add_row(GTK_TABLE(hardware_table), _("Machine model:"),
-+ data->machine_type_model.c_str(), 0);
+
++ add_row(GTK_TABLE(hardware_table), _("Machine model:"),
++ data->machine_type_model.c_str(), 0);
+
markup = procman::format_size(data->memory_bytes);
memory_label = add_row(GTK_TABLE(hardware_table), _("Memory:"),
- markup, 0);
@@ -528,7 +540,7 @@
const gchar * t;
if (data->processors.size() > 1) {
markup = g_strdup_printf(_("Processor %d:"), i);
-@@ -593,18 +660,31 @@
+@@ -593,20 +664,33 @@ procman_create_sysinfo_view(void)
}
processor_label = add_row(GTK_TABLE(hardware_table), t,
@@ -539,29 +551,32 @@
g_free(markup);
}
-+
-+ add_row(GTK_TABLE(hardware_table), _("Serial number:"),
+- /* disk space section */
+
+- markup = g_strdup_printf(_("<b>System Status</b>"));
+- disk_space_table = add_section(GTK_BOX(vbox), markup, 1, 2, NULL);
+- g_free(markup);
++ add_row(GTK_TABLE(hardware_table), _("Serial number:"),
+ data->system_serial.c_str(), 2 + i);
-+ add_row(GTK_TABLE(hardware_table), _("System UUID:"),
++ add_row(GTK_TABLE(hardware_table), _("System UUID:"),
+ data->system_board_serial.c_str(), 3 + i);
+
+ /* bios section */
+
+ bios_table = add_section(GTK_BOX(vbox), _("<b>BIOS</b>"), 2, 2, NULL);
-+
++
+ bios_version_label = add_row(GTK_TABLE(bios_table), _("BIOS version:"),
+ data->bios_version.c_str(), 0);
+ bios_date_label = add_row(GTK_TABLE(bios_table), _("BIOS date:"),
+ data->bios_date.c_str(), 1);
+
- /* disk space section */
-+ disk_space_table = add_section(GTK_BOX(vbox), _("<b>System Status</b>"),
++ /* disk space section */
++ disk_space_table = add_section(GTK_BOX(vbox), _("<b>System Status</b>"),
+ 1, 2, NULL);
-- markup = g_strdup_printf(_("<b>System Status</b>"));
-- disk_space_table = add_section(GTK_BOX(vbox), markup, 1, 2, NULL);
-- g_free(markup);
--
markup = procman::format_size(data->free_space_bytes);
- disk_space_label = add_row(GTK_TABLE(disk_space_table),
+- disk_space_label = add_row(GTK_TABLE(disk_space_table),
++ disk_space_label = add_row(GTK_TABLE(disk_space_table),
_("Available disk space:"), markup,
+ 0);
+ g_free(markup);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org