← Back to branch summary

~noskcaj/ubuntu/vivid/gnome-system-monitor/3.15

« back to all changes in this revision

Viewing changes to src/procman-app.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-23 13:58:52 UTC
  • mfrom: (1.1.76) (2.1.14 experimental)
  • Revision ID: package-import@ubuntu.com-20130323135852-qra4j4aefb4t9lvx
Tags: 3.7.92-1ubuntu1
* Sync with Debian. Remaining changes:
* debian/control.in:
  - Drop build-depends on rarian-compat and itstool
* debian/control.in, debian/rules:
  - Run autoreconf
  - Don't run autopoint, it causes configure error with intltool
* debian/patches/quit-accel-fix:
  - Quit when Ctrl+Q is pressed 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/procman-app.cpp
4
4
#include <glibtop.h>
5
5
#include <glibtop/close.h>
6
6
 
 
7
#ifdef HAVE_SYSTEMD
 
8
#include <systemd/sd-daemon.h>
 
9
#endif
 
10
 
7
11
#include "procman-app.h"
8
12
#include "interface.h"
9
13
#include "proctable.h"
537
541
        order_variant = g_variant_new("ai", builder);
538
542
        g_settings_set_value(pt_settings, "columns-order", order_variant);
539
543
 
 
544
        g_variant_builder_unref(builder);
540
545
        g_slist_free(order);
541
546
    }
542
547
 
596
601
 
597
602
    on_activate ();
598
603
 
 
604
    g_strfreev(argv);
 
605
 
599
606
    return 0;
600
607
}
601
608