[gnome-system-monitor/ubergraph: 10/10] Merge remote-tracking branch 'origin' into ubergraph

[Robert Roth <robertroth src gnome org>]

commit 74640b2d9e35059aa1130fee4230963117729872
Merge: 40902b6 5652b46
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Jul 22 22:07:56 2013 +0300

    Merge remote-tracking branch 'origin' into ubergraph

 .gitignore             |    2 +
 Makefile.am            |   24 ++++---
 configure.ac           |   35 ++++++--
 pixmaps/Makefile.am    |    4 -
 pixmaps/side.png       |  Bin 3429 -> 0 bytes
 pixmaps/side.xcf       |  Bin 29683 -> 0 bytes
 po/it.po               |  204 ++++++++++++++++++++++++++----------------------
 po/nb.po               |  156 ++++++++++++++++++++----------------
 src/Makefile.am        |   38 ++++++----
 src/gsm.gresource.xml  |   14 ++++
 src/gsm_color_button.c |   18 +++--
 src/interface.cpp      |   32 +-------
 src/interface.h        |    1 -
 src/load-graph.cpp     |    7 ++-
 src/load-graph.h       |    4 +
 src/lsof.cpp           |   15 +---
 src/openfiles.cpp      |    5 +-
 src/prettytable.cpp    |   14 +++-
 src/prettytable.h      |    7 ++-
 src/procdialogs.cpp    |   10 +--
 src/procman-app.cpp    |    7 +-
 src/procman-app.h      |    2 +
 src/procproperties.cpp |    2 +
 src/proctable.cpp      |   30 +++++++-
 24 files changed, 359 insertions(+), 272 deletions(-)
---
diff --cc .gitignore
index 77cebb9,c8d309a..f695647
--- a/.gitignore
+++ b/.gitignore
@@@ -62,7 -62,6 +62,8 @@@ src/Makefile.i
  *.lo
  *.la
  src/gnome-system-monitor
 +src/nextmon
++src/gsm-resources.c
  src/org.gnome.gnome-system-monitor.enums.xml
  src/org.gnome.gnome-system-monitor.gschema.valid
  src/org.gnome.gnome-system-monitor.gschema.xml
@@@ -76,3 -73,3 +77,4 @@@ scripts/gsm-kil
  scripts/gsm-renice
  gnome-system-monitor-kde.desktop
  gnome-system-monitor-kde.desktop.in
++compile
diff --cc Makefile.am
index 7fc4d74,a376f6f..5caae71
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,17 -1,20 +1,20 @@@
  ## Process this file with automake to produce Makefile.in
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
- SUBDIRS = pixmaps po uber scripts src help
 -SUBDIRS = po scripts src help
++SUBDIRS = po uber scripts src help
  
- uidir = $(pkgdatadir)
- ui_DATA = data/preferences.ui \
-           data/renice.ui \
-           data/lsof.ui \
-           data/openfiles.ui \
-           data/interface.ui \
-           data/menus.ui \
-           data/popups.ui
+ ui_files = \
+       data/preferences.ui \
+       data/renice.ui \
+       data/lsof.ui \
+       data/openfiles.ui \
+       data/interface.ui \
+       data/menus.ui \
+       data/popups.ui
  
+ pixmap_files = \
+       pixmaps/download.svg \
+       pixmaps/upload.svg
  
  runnabledir = $(pkglibexecdir)
  runnable_SCRIPTS = scripts/gsm-renice \
diff --cc configure.ac
index 2c87812,e2765b0..171069c
--- a/configure.ac
+++ b/configure.ac
@@@ -109,9 -123,7 +127,8 @@@ YELP_HELP_INI
  AC_CONFIG_FILES([
  Makefile
  scripts/Makefile
 +uber/Makefile
  src/Makefile
- pixmaps/Makefile
  po/Makefile.in
  help/Makefile
  gnome-system-monitor.desktop.in
diff --cc src/Makefile.am
index 254902e,0d2559b..577ea04
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,32 -1,16 +1,35 @@@
  ## Process this file with automake to produce Makefile.in
  
- INCLUDES = \
-       -DPROCMAN_DATADIR=\""$(datadir)/procman/"\" \
+ AM_CPPFLAGS = \
        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-       -DDATADIR=\""$(datadir)"\" \
-       @PROCMAN_CFLAGS@ \
-       @SYSTEMD_CFLAGS@
+       -DGSM_LIBEXEC_DIR=\""$(pkglibexecdir)"\" \
+       $(PROCMAN_CFLAGS) \
+       $(SYSTEMD_CFLAGS) \
+       $(WNCK_CFLAGS)
  
 -bin_PROGRAMS = gnome-system-monitor
 +bin_PROGRAMS = gnome-system-monitor nextmon
 +
 +nextmon_c_files = \
 +    sysmon.c \
 +    system-monitor.c
 +
 +nextmon_h_files = \
 +    sysmon.h
 +
 +nextmon_SOURCES = \
 +    $(nextmon_h_files) \
 +    $(nextmon_c_files)
 +
 +nextmon_LDADD = @PROCMAN_LIBS@ $(top_builddir)/uber/libuber-1.0.la -ldl
 +
 +nextmon_CPPFLAGS = \
++        $(PROCMAN_CFLAGS) \
 +      -I$(top_srcdir) \
 +      -I$(top_builddir)/uber \
 +      -DGSM_DATA_DIR=\""$(pkgdatadir)"\"
  
+ BUILT_SOURCES = gsm-resources.c
+ 
  gnome_system_monitor_cpp_files = \
        argv.cpp \
        interface.cpp \