OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-system-monitor?expand=0&rev=29
This commit is contained in:
parent
f4e058df28
commit
a4a8651c04
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1ac282e9db2871d1274b2bd72f6d15d7ffc7cd8d9932f0ac4903d383f98cc59c
|
|
||||||
size 2004578
|
|
3
gnome-system-monitor-2.24.4.tar.bz2
Normal file
3
gnome-system-monitor-2.24.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f894f81df717ff9b1f8eb052c0e47fa54ca45a3a65ba2331564793ea59caf17e
|
||||||
|
size 1981017
|
@ -70,18 +70,4 @@ Index: src/proctable.cpp
|
|||||||
tree_store_update(model, &info->node, COL_VMSIZE, info->vmsize);
|
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_MEMRES, info->memres);
|
||||||
tree_store_update(model, &info->node, COL_MEMWRITABLE, info->memwritable);
|
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
Index: configure.in
|
Index: configure.in
|
||||||
===================================================================
|
===================================================================
|
||||||
--- configure.in (revision 2495)
|
--- configure.in.orig
|
||||||
+++ configure.in (working copy)
|
+++ configure.in
|
||||||
@@ -37,7 +37,7 @@
|
@@ -37,7 +37,7 @@ LIBXML_REQUIRED=2.0
|
||||||
RSVG_REQUIRED=2.12
|
RSVG_REQUIRED=2.12
|
||||||
DBUS_REQUIRED=0.7
|
DBUS_REQUIRED=0.7
|
||||||
|
|
||||||
@ -13,8 +13,8 @@ Index: configure.in
|
|||||||
AC_ARG_ENABLE(more-warnings,
|
AC_ARG_ENABLE(more-warnings,
|
||||||
Index: src/hardware.h
|
Index: src/hardware.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/hardware.h (revision 0)
|
--- /dev/null
|
||||||
+++ src/hardware.h (revision 0)
|
+++ src/hardware.h
|
||||||
@@ -0,0 +1,32 @@
|
@@ -0,0 +1,32 @@
|
||||||
+/* Gnome System Monitor - hardware.h
|
+/* Gnome System Monitor - hardware.h
|
||||||
+ * Copyright (C) 2008 Novell, Inc.
|
+ * Copyright (C) 2008 Novell, Inc.
|
||||||
@ -50,9 +50,9 @@ Index: src/hardware.h
|
|||||||
+#endif
|
+#endif
|
||||||
Index: src/hardware.cpp
|
Index: src/hardware.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/hardware.cpp (revision 0)
|
--- /dev/null
|
||||||
+++ src/hardware.cpp (revision 0)
|
+++ src/hardware.cpp
|
||||||
@@ -0,0 +1,285 @@
|
@@ -0,0 +1,293 @@
|
||||||
+/* Gnome System Monitor - hardware.cpp
|
+/* Gnome System Monitor - hardware.cpp
|
||||||
+ * Copyright (C) 2008 Novell, Inc.
|
+ * Copyright (C) 2008 Novell, Inc.
|
||||||
+ *
|
+ *
|
||||||
@ -78,6 +78,7 @@ Index: src/hardware.cpp
|
|||||||
+#include <gtk/gtkvbox.h>
|
+#include <gtk/gtkvbox.h>
|
||||||
+#include <gtk/gtkscrolledwindow.h>
|
+#include <gtk/gtkscrolledwindow.h>
|
||||||
+
|
+
|
||||||
|
+#include <sigc++/bind.h>
|
||||||
+#include <gtkmm/treeiter.h>
|
+#include <gtkmm/treeiter.h>
|
||||||
+
|
+
|
||||||
+#include <hd.h>
|
+#include <hd.h>
|
||||||
@ -152,7 +153,7 @@ Index: src/hardware.cpp
|
|||||||
+ { hw_wlan, "", _("WLAN Interface") },
|
+ { hw_wlan, "", _("WLAN Interface") },
|
||||||
+ { hw_redasd, "", "redasd??" },
|
+ { hw_redasd, "", "redasd??" },
|
||||||
+ { hw_dsl, "", _("DSL Modem") },
|
+ { hw_dsl, "", _("DSL Modem") },
|
||||||
+ { hw_block, "", _("Block Device") },
|
+ { hw_block, "", _("Block Device") },
|
||||||
+ { hw_tape, "media-tape", _("Tape Drive") },
|
+ { hw_tape, "media-tape", _("Tape Drive") },
|
||||||
+ { hw_vbe, "", _("vbe???") },
|
+ { hw_vbe, "", _("vbe???") },
|
||||||
+ { hw_bluetooth, "", _("Bluetooth Device") },
|
+ { hw_bluetooth, "", _("Bluetooth Device") },
|
||||||
@ -195,19 +196,21 @@ Index: src/hardware.cpp
|
|||||||
+ hw_map_t::const_iterator iter = hw_map.find(hwclass);
|
+ hw_map_t::const_iterator iter = hw_map.find(hwclass);
|
||||||
+ if(iter != hw_map.end() && iter->second && iter->second->icon
|
+ if(iter != hw_map.end() && iter->second && iter->second->icon
|
||||||
+ && *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);
|
+ Gtk::ICON_LOOKUP_USE_BUILTIN);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ return pixbuf;
|
+ return pixbuf;
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+
|
+static
|
||||||
+void populate_hardware_view(GtkTreeStore * model)
|
+void populate_hardware_view(GtkTreeStore * model)
|
||||||
+{
|
+{
|
||||||
+ hd_data_t *hd_data;
|
+ hd_data_t *hd_data;
|
||||||
+ hd_t *hd;
|
+ hd_t *hd;
|
||||||
+
|
+
|
||||||
|
+ g_object_freeze_notify(G_OBJECT(model));
|
||||||
|
+
|
||||||
+ std::map<std::string, Gtk::TreeIter> item_map;
|
+ std::map<std::string, Gtk::TreeIter> item_map;
|
||||||
+ std::list<Gtk::TreeIter> unparented;
|
+ std::list<Gtk::TreeIter> unparented;
|
||||||
+ hd_data = (hd_data_t *)calloc(1, sizeof *hd_data);
|
+ hd_data = (hd_data_t *)calloc(1, sizeof *hd_data);
|
||||||
@ -227,15 +230,15 @@ Index: src/hardware.cpp
|
|||||||
+ parent = iter->second.gobj();
|
+ parent = iter->second.gobj();
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ Glib::RefPtr<Gdk::Pixbuf> pixbuf = get_hardware_icon(iclass);
|
+ Glib::RefPtr<Gdk::Pixbuf> pixbuf = get_hardware_icon(iclass);
|
||||||
+ const char * device_type = get_hardware_type(iclass);
|
+ const char * device_type = get_hardware_type(iclass);
|
||||||
+ if(name && *name) {
|
+ if(name && *name) {
|
||||||
+ Gtk::TreeIter iter;
|
+ Gtk::TreeIter iter;
|
||||||
+ gtk_tree_store_append(model, iter.gobj(), parent);
|
+ 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_ICON, pixbuf ? pixbuf->gobj() : NULL,
|
||||||
+ HW_TYPE, device_type ? device_type : "",
|
+ HW_TYPE, device_type ? device_type : "",
|
||||||
+ -1);
|
+ -1);
|
||||||
+ item_map[hd->unique_id] = iter;
|
+ item_map[hd->unique_id] = iter;
|
||||||
+ if(hd->parent_id && !parent) {
|
+ if(hd->parent_id && !parent) {
|
||||||
@ -252,11 +255,14 @@ Index: src/hardware.cpp
|
|||||||
+ // reparent
|
+ // reparent
|
||||||
+ unparented.pop_front();
|
+ unparented.pop_front();
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
+ hd_free_hd_list(hd); /* free it */
|
+ hd_free_hd_list(hd); /* free it */
|
||||||
+ hd_free_hd_data(hd_data);
|
+ hd_free_hd_data(hd_data);
|
||||||
+ free(hd_data);
|
+ free(hd_data);
|
||||||
|
+ free(hd);
|
||||||
|
+ g_object_thaw_notify(G_OBJECT(model));
|
||||||
|
+ g_object_unref(model);
|
||||||
+}
|
+}
|
||||||
+
|
+
|
||||||
+
|
+
|
||||||
@ -317,7 +323,7 @@ Index: src/hardware.cpp
|
|||||||
+ gtk_tree_view_column_set_reorderable(col, TRUE);
|
+ gtk_tree_view_column_set_reorderable(col, TRUE);
|
||||||
+ gtk_tree_view_column_set_resizable(col, TRUE);
|
+ gtk_tree_view_column_set_resizable(col, TRUE);
|
||||||
+ gtk_tree_view_append_column(GTK_TREE_VIEW(hw_tree), col);
|
+ gtk_tree_view_append_column(GTK_TREE_VIEW(hw_tree), col);
|
||||||
+
|
+
|
||||||
+ /* type */
|
+ /* type */
|
||||||
+ col = gtk_tree_view_column_new();
|
+ col = gtk_tree_view_column_new();
|
||||||
+ cell = gtk_cell_renderer_text_new();
|
+ cell = gtk_cell_renderer_text_new();
|
||||||
@ -330,7 +336,9 @@ Index: src/hardware.cpp
|
|||||||
+ gtk_tree_view_column_set_resizable(col, TRUE);
|
+ gtk_tree_view_column_set_resizable(col, TRUE);
|
||||||
+ gtk_tree_view_append_column(GTK_TREE_VIEW(hw_tree), col);
|
+ 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);
|
+ gtk_widget_show_all(vbox);
|
||||||
+
|
+
|
||||||
@ -340,8 +348,8 @@ Index: src/hardware.cpp
|
|||||||
+
|
+
|
||||||
Index: src/interface.cpp
|
Index: src/interface.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/interface.cpp (revision 2495)
|
--- src/interface.cpp.orig
|
||||||
+++ src/interface.cpp (working copy)
|
+++ src/interface.cpp
|
||||||
@@ -1,5 +1,6 @@
|
@@ -1,5 +1,6 @@
|
||||||
/* Procman - main window
|
/* Procman - main window
|
||||||
* Copyright (C) 2001 Kevin Vandersloot
|
* Copyright (C) 2001 Kevin Vandersloot
|
||||||
@ -357,7 +365,7 @@ Index: src/interface.cpp
|
|||||||
|
|
||||||
static void cb_toggle_tree (GtkAction *action, gpointer data);
|
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 *menubar;
|
||||||
GtkWidget *main_box;
|
GtkWidget *main_box;
|
||||||
GtkWidget *notebook;
|
GtkWidget *notebook;
|
||||||
@ -369,7 +377,7 @@ Index: src/interface.cpp
|
|||||||
GtkWidget *sysinfo_box, *sysinfo_label;
|
GtkWidget *sysinfo_box, *sysinfo_label;
|
||||||
|
|
||||||
app = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
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"));
|
tab_label3 = gtk_label_new (_("File Systems"));
|
||||||
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), devices_box, tab_label3);
|
gtk_notebook_append_page (GTK_NOTEBOOK (notebook), devices_box, tab_label3);
|
||||||
|
|
||||||
@ -382,9 +390,9 @@ Index: src/interface.cpp
|
|||||||
g_signal_connect (G_OBJECT (notebook), "change-current-page",
|
g_signal_connect (G_OBJECT (notebook), "change-current-page",
|
||||||
Index: src/Makefile.am
|
Index: src/Makefile.am
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/Makefile.am (revision 2495)
|
--- src/Makefile.am.orig
|
||||||
+++ src/Makefile.am (working copy)
|
+++ src/Makefile.am
|
||||||
@@ -24,6 +24,7 @@
|
@@ -24,6 +24,7 @@ gnome_system_monitor_SOURCES = \
|
||||||
smooth_refresh.cpp smooth_refresh.h \
|
smooth_refresh.cpp smooth_refresh.h \
|
||||||
defaulttable.h \
|
defaulttable.h \
|
||||||
disks.cpp disks.h \
|
disks.cpp disks.h \
|
||||||
@ -394,8 +402,8 @@ Index: src/Makefile.am
|
|||||||
procman_gksu.h procman_gksu.cpp \
|
procman_gksu.h procman_gksu.cpp \
|
||||||
Index: src/sysinfo.cpp
|
Index: src/sysinfo.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/sysinfo.cpp (revision 2495)
|
--- src/sysinfo.cpp.orig
|
||||||
+++ src/sysinfo.cpp (working copy)
|
+++ src/sysinfo.cpp
|
||||||
@@ -13,6 +13,8 @@
|
@@ -13,6 +13,8 @@
|
||||||
#include <glibtop/mem.h>
|
#include <glibtop/mem.h>
|
||||||
#include <glibtop/sysinfo.h>
|
#include <glibtop/sysinfo.h>
|
||||||
@ -405,11 +413,11 @@ Index: src/sysinfo.cpp
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
@@ -36,6 +38,18 @@
|
@@ -36,6 +38,18 @@ using std::vector;
|
||||||
|
|
||||||
namespace {
|
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)
|
+ DBusError * error)
|
||||||
+ {
|
+ {
|
||||||
+ string prop_val;
|
+ string prop_val;
|
||||||
@ -424,7 +432,7 @@ Index: src/sysinfo.cpp
|
|||||||
|
|
||||||
class SysInfo
|
class SysInfo
|
||||||
{
|
{
|
||||||
@@ -51,6 +65,12 @@
|
@@ -51,6 +65,12 @@ namespace {
|
||||||
guint n_processors;
|
guint n_processors;
|
||||||
vector<string> processors;
|
vector<string> processors;
|
||||||
|
|
||||||
@ -437,7 +445,7 @@ Index: src/sysinfo.cpp
|
|||||||
|
|
||||||
SysInfo()
|
SysInfo()
|
||||||
{
|
{
|
||||||
@@ -59,6 +79,7 @@
|
@@ -59,6 +79,7 @@ namespace {
|
||||||
this->load_disk_info();
|
this->load_disk_info();
|
||||||
this->load_uname_info();
|
this->load_uname_info();
|
||||||
this->load_gnome_version();
|
this->load_gnome_version();
|
||||||
@ -445,7 +453,7 @@ Index: src/sysinfo.cpp
|
|||||||
}
|
}
|
||||||
|
|
||||||
virtual ~SysInfo()
|
virtual ~SysInfo()
|
||||||
@@ -182,6 +203,45 @@
|
@@ -182,6 +203,49 @@ namespace {
|
||||||
|
|
||||||
this->gnome_version = values[0] + '.' + values[1] + '.' + values[2];
|
this->gnome_version = values[0] + '.' + values[1] + '.' + values[2];
|
||||||
}
|
}
|
||||||
@ -465,23 +473,27 @@ Index: src/sysinfo.cpp
|
|||||||
+ libhal_ctx_set_dbus_connection (ctx, connection);
|
+ libhal_ctx_set_dbus_connection (ctx, connection);
|
||||||
+ if(!libhal_ctx_init (ctx, &error)) {
|
+ if(!libhal_ctx_init (ctx, &error)) {
|
||||||
+ printf("ctx init failed\n");
|
+ 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",
|
+ this->bios_version = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
|
||||||
+ "system.firmware.version", &error);
|
+ "system.firmware.version", NULL);
|
||||||
+ this->bios_date = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
|
+ this->bios_date = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
|
||||||
+ "system.firmware.release_date", &error);
|
+ "system.firmware.release_date", NULL);
|
||||||
+ this->machine_type_model = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
|
+ 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()) {
|
+ if(this->machine_type_model.empty()) {
|
||||||
+ dbus_error_init(&error);
|
+ dbus_error_init(&error);
|
||||||
+ this->machine_type_model = get_hal_property(ctx, "/org/freedesktop/Hal/devices/computer",
|
+ 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",
|
+ 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",
|
+ 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_shutdown (ctx, &error);
|
||||||
+ libhal_ctx_free(ctx);
|
+ libhal_ctx_free(ctx);
|
||||||
@ -491,7 +503,7 @@ Index: src/sysinfo.cpp
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -485,6 +545,10 @@
|
@@ -485,6 +549,10 @@ procman_create_sysinfo_view(void)
|
||||||
GtkWidget *memory_label;
|
GtkWidget *memory_label;
|
||||||
GtkWidget *processor_label;
|
GtkWidget *processor_label;
|
||||||
|
|
||||||
@ -502,19 +514,19 @@ Index: src/sysinfo.cpp
|
|||||||
GtkWidget *disk_space_table;
|
GtkWidget *disk_space_table;
|
||||||
GtkWidget *disk_space_label;
|
GtkWidget *disk_space_label;
|
||||||
|
|
||||||
@@ -571,17 +635,20 @@
|
@@ -571,17 +639,20 @@ procman_create_sysinfo_view(void)
|
||||||
|
|
||||||
/* hardware section */
|
/* hardware section */
|
||||||
|
|
||||||
- markup = g_strdup_printf(_("<b>Hardware</b>"));
|
- markup = g_strdup_printf(_("<b>Hardware</b>"));
|
||||||
- hardware_table = add_section(GTK_BOX(vbox), markup, data->processors.size(), 2, NULL);
|
- hardware_table = add_section(GTK_BOX(vbox), markup, data->processors.size(), 2, NULL);
|
||||||
- g_free(markup);
|
- 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);
|
+ 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);
|
markup = procman::format_size(data->memory_bytes);
|
||||||
memory_label = add_row(GTK_TABLE(hardware_table), _("Memory:"),
|
memory_label = add_row(GTK_TABLE(hardware_table), _("Memory:"),
|
||||||
- markup, 0);
|
- markup, 0);
|
||||||
@ -528,7 +540,7 @@ Index: src/sysinfo.cpp
|
|||||||
const gchar * t;
|
const gchar * t;
|
||||||
if (data->processors.size() > 1) {
|
if (data->processors.size() > 1) {
|
||||||
markup = g_strdup_printf(_("Processor %d:"), i);
|
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,
|
processor_label = add_row(GTK_TABLE(hardware_table), t,
|
||||||
@ -539,29 +551,32 @@ Index: src/sysinfo.cpp
|
|||||||
g_free(markup);
|
g_free(markup);
|
||||||
}
|
}
|
||||||
|
|
||||||
+
|
- /* disk space section */
|
||||||
+ add_row(GTK_TABLE(hardware_table), _("Serial number:"),
|
|
||||||
|
- 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);
|
+ 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);
|
+ data->system_board_serial.c_str(), 3 + i);
|
||||||
+
|
+
|
||||||
+ /* bios section */
|
+ /* bios section */
|
||||||
+
|
+
|
||||||
+ bios_table = add_section(GTK_BOX(vbox), _("<b>BIOS</b>"), 2, 2, NULL);
|
+ bios_table = add_section(GTK_BOX(vbox), _("<b>BIOS</b>"), 2, 2, NULL);
|
||||||
+
|
+
|
||||||
+ bios_version_label = add_row(GTK_TABLE(bios_table), _("BIOS version:"),
|
+ bios_version_label = add_row(GTK_TABLE(bios_table), _("BIOS version:"),
|
||||||
+ data->bios_version.c_str(), 0);
|
+ data->bios_version.c_str(), 0);
|
||||||
+ bios_date_label = add_row(GTK_TABLE(bios_table), _("BIOS date:"),
|
+ bios_date_label = add_row(GTK_TABLE(bios_table), _("BIOS date:"),
|
||||||
+ data->bios_date.c_str(), 1);
|
+ data->bios_date.c_str(), 1);
|
||||||
+
|
+
|
||||||
/* disk space section */
|
+ /* disk space section */
|
||||||
+ disk_space_table = add_section(GTK_BOX(vbox), _("<b>System Status</b>"),
|
+ disk_space_table = add_section(GTK_BOX(vbox), _("<b>System Status</b>"),
|
||||||
+ 1, 2, NULL);
|
+ 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);
|
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,
|
_("Available disk space:"), markup,
|
||||||
|
0);
|
||||||
|
g_free(markup);
|
||||||
|
@ -1,3 +1,23 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 7 18:50:23 EST 2009 - hfiguiere@suse.de
|
Wed Jan 7 18:50:23 EST 2009 - hfiguiere@suse.de
|
||||||
|
|
||||||
|
@ -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.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -43,8 +43,8 @@ BuildRequires: update-desktop-files
|
|||||||
BuildRequires: hal-devel hwinfo-devel
|
BuildRequires: hal-devel hwinfo-devel
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
Group: System/GUI/GNOME
|
Group: System/GUI/GNOME
|
||||||
Version: 2.24.1
|
Version: 2.24.4
|
||||||
Release: 2
|
Release: 1
|
||||||
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-system-monitor/2.24/%{name}-%{version}.tar.bz2
|
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
|
# PATCH-FIX-UPSTREAM bgo#566962 - hfiguiere@novell.com
|
||||||
Patch0: gnome-system-monitor-bgo566962-leaks.diff
|
Patch0: gnome-system-monitor-bgo566962-leaks.diff
|
||||||
@ -57,6 +57,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
Summary: A Simple Process Monitor
|
Summary: A Simple Process Monitor
|
||||||
Requires: gnome-icon-theme
|
Requires: gnome-icon-theme
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
|
Requires: lsb
|
||||||
%gconf_schemas_prereq
|
%gconf_schemas_prereq
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -116,6 +117,17 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
%changelog
|
%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
|
* Wed Jan 07 2009 hfiguiere@suse.de
|
||||||
- Add gnome-system-monitor-bgo566962-leaks.diff
|
- Add gnome-system-monitor-bgo566962-leaks.diff
|
||||||
* Fix memory leaks (bgo#566962)
|
* Fix memory leaks (bgo#566962)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user