rpms/gnome-system-monitor
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update translations for about-this-computer.desktop, tweak patch a bit

Browse Source
This commit is contained in:
Will Woods 2008-04-04 19:18:42 +00:00
parent 2ab1bf93fa
commit 3b42fe7c2d
3 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
about-this-computer.desktop
View File

@ -1,8 +1,30 @@
[Desktop Entry] [Desktop Entry]
Name=About This Computer Name=About This Computer
Name[en_US]=About This Computer Name[en]=About This Computer
Comment=Get some basic information about this computer Name[cs]=O tomto počítači
Comment[en_US]=Get some basic information about this computer Name[el]=Σχετικά με τον υπολογιστή
Name[fi]=Tietoja tästä tietokoneesta
Name[de]=Über diesen Computer
Name[pl]=Informacje o komputerze
Name[sr]=О овом рачунару
Name[sr@latin]=O ovom računaru
Name[nl]=Over Deze Computer
Name[sv]=Om den här datorn
Name[es]=Acerca de esta Computadora
Name[zh_CN]=关于本计算机
Comment=Get some basic information about this computer
Comment[en]=Get some basic information about this computer
Comment[cs]=Základní informace o tomto počítači
Comment[el]=Δείτε βασικές πληροφορίες για αυτόν τον υπολογιστή
Comment[fi]=Perustietoja tästä tietokoneesta
Comment[de]=Erhalten Sie Basis-Informationen über dieses System
Comment[pl]=Więcej informacji o komputerze
Comment[sr]=Сазнајте основне информације о овом рачунару
Comment[sr@latin]=Saznajte osnovne informacije o ovom računaru
Comment[nl]=Geef basis informatie weer over deze computer
Comment[sv]=Få grundläggande information om den här datorn
Comment[es]=Obten información básica sobre esta computadora
Comment[zh_CN]=获取本计算机的一些基本信息
Exec=gnome-system-monitor --show-system-tab Exec=gnome-system-monitor --show-system-tab
Icon=computer Icon=computer
Terminal=false Terminal=false

22
gnome-system-monitor-2.21.92-system-tab-arg.patch → gnome-system-monitor-2.22.0-system-tab-arg.patch
View File

@ -1,6 +1,6 @@
diff -up gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg gnome-system-monitor-2.21.92/src/procman.h diff -up gnome-system-monitor-2.22.0/src/procman.h.system-tab-arg gnome-system-monitor-2.22.0/src/procman.h
--- gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg 2008-03-08 10:18:31.000000000 -0500 --- gnome-system-monitor-2.22.0/src/procman.h.system-tab-arg 2008-04-01 17:09:29.000000000 -0400
+++ gnome-system-monitor-2.21.92/src/procman.h 2008-03-08 10:18:31.000000000 -0500 +++ gnome-system-monitor-2.22.0/src/procman.h 2008-04-01 17:09:29.000000000 -0400
@@ -58,6 +58,7 @@ enum @@ -58,6 +58,7 @@ enum
static const unsigned MIN_UPDATE_INTERVAL = 1 * 1000; static const unsigned MIN_UPDATE_INTERVAL = 1 * 1000;
static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000; static const unsigned MAX_UPDATE_INTERVAL = 100 * 1000;
@ -9,10 +9,10 @@ diff -up gnome-system-monitor-2.21.92/src/procman.h.system-tab-arg gnome-system-
enum ProcmanTab enum ProcmanTab
{ {
diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-system-monitor-2.21.92/src/procman.cpp diff -up gnome-system-monitor-2.22.0/src/procman.cpp.system-tab-arg gnome-system-monitor-2.22.0/src/procman.cpp
--- gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg 2008-03-08 10:18:31.000000000 -0500 --- gnome-system-monitor-2.22.0/src/procman.cpp.system-tab-arg 2008-04-01 17:09:29.000000000 -0400
+++ gnome-system-monitor-2.21.92/src/procman.cpp 2008-03-08 10:36:19.000000000 -0500 +++ gnome-system-monitor-2.22.0/src/procman.cpp 2008-04-01 17:10:20.000000000 -0400
@@ -626,14 +626,20 @@ cb_server (const gchar *msg, gpointer us @@ -626,14 +626,19 @@ cb_server (const gchar *msg, gpointer us
{ {
GdkWindow *window; GdkWindow *window;
ProcData *procdata; ProcData *procdata;
@ -29,13 +29,12 @@ diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-syste
+ if (msg != NULL && strcmp(SHOW_SYSTEM_TAB_CMD, msg) == 0) { + if (msg != NULL && strcmp(SHOW_SYSTEM_TAB_CMD, msg) == 0) {
+ procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message"); + procman_debug("Changing to PROCMAN_TAB_SYSINFO via bacon message");
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO); + gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);
+ cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);
+ } else + } else
+ timestamp = strtoul(msg, NULL, 0); + timestamp = strtoul(msg, NULL, 0);
if (timestamp == 0) if (timestamp == 0)
{ {
@@ -669,12 +675,28 @@ main (int argc, char *argv[]) @@ -669,12 +674,28 @@ main (int argc, char *argv[])
ProcData *procdata; ProcData *procdata;
BaconMessageConnection *conn; BaconMessageConnection *conn;
@ -64,7 +63,7 @@ diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-syste
Gtk::Main kit(&argc, &argv); Gtk::Main kit(&argc, &argv);
procman_debug("post gtk_init"); procman_debug("post gtk_init");
@@ -691,6 +713,9 @@ main (int argc, char *argv[]) @@ -691,6 +712,9 @@ main (int argc, char *argv[])
timestamp = g_strdup_printf ("%" G_GUINT32_FORMAT, startup_timestamp); timestamp = g_strdup_printf ("%" G_GUINT32_FORMAT, startup_timestamp);
@ -74,14 +73,13 @@ diff -up gnome-system-monitor-2.21.92/src/procman.cpp.system-tab-arg gnome-syste
bacon_message_connection_send (conn, timestamp); bacon_message_connection_send (conn, timestamp);
gdk_notify_startup_complete (); gdk_notify_startup_complete ();
@@ -727,6 +752,12 @@ main (int argc, char *argv[]) @@ -727,6 +751,11 @@ main (int argc, char *argv[])
g_assert(procdata->app); g_assert(procdata->app);
+ if (show_system_tab) { + if (show_system_tab) {
+ procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request"); + procman_debug("Starting with PROCMAN_TAB_SYSINFO by commandline request");
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO); + gtk_notebook_set_current_page(GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO);
+ cb_change_current_page (GTK_NOTEBOOK(procdata->notebook), PROCMAN_TAB_SYSINFO, procdata);
+ } + }
+ +
gtk_widget_show(procdata->app); gtk_widget_show(procdata->app);

9
gnome-system-monitor.spec
View File

@ -13,7 +13,7 @@
Summary: Simple process monitor Summary: Simple process monitor
Name: gnome-system-monitor Name: gnome-system-monitor
Version: 2.22.0 Version: 2.22.0
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://www.gnome.org/ URL: http://www.gnome.org/
@ -43,8 +43,8 @@ BuildRequires: autoconf, automake, libtool
# send upstream: http://bugzilla.gnome.org/show_bug.cgi?id=491462 # send upstream: http://bugzilla.gnome.org/show_bug.cgi?id=491462
Patch0: gnome-system-monitor-2.21.92-polkit.patch Patch0: gnome-system-monitor-2.21.92-polkit.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=522988 # Upstreamed. See http://bugzilla.gnome.org/show_bug.cgi?id=522988
Patch1: gnome-system-monitor-2.21.92-system-tab-arg.patch Patch1: gnome-system-monitor-2.22.0-system-tab-arg.patch
Requires: PolicyKit-gnome >= %{polkit_gnome_version} Requires: PolicyKit-gnome >= %{polkit_gnome_version}
Requires(pre): GConf2 >= %{gconf_version} Requires(pre): GConf2 >= %{gconf_version}
@ -124,6 +124,9 @@ scrollkeeper-update -q
%changelog %changelog
* Fri Apr 4 2008 Will Woods <wwoods@redhat.com> - 2.22.0-2
- Update translations in about-this-computer.desktop
* Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1 * Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1
- Update to 2.22.0 - Update to 2.22.0