diff options
| author | Karel Klic <kklic@redhat.com> | 2010-03-18 11:37:36 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-03-18 11:37:36 +0100 |
| commit | ec0ffd2b421898b4165cb98ab92da50fc935107e (patch) | |
| tree | 59294771c5253751843dee89d81df438ddb6475f /src | |
| parent | 7bc2585fe81ce94d05a3b7c8045c0177a6fc70cc (diff) | |
| parent | af63575dae4d2705b13966b1583230567b46538c (diff) | |
| download | abrt-ec0ffd2b421898b4165cb98ab92da50fc935107e.tar.gz abrt-ec0ffd2b421898b4165cb98ab92da50fc935107e.tar.xz abrt-ec0ffd2b421898b4165cb98ab92da50fc935107e.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/Gui/CCDump.py | 2 | ||||
| -rw-r--r-- | src/Gui/CCMainWindow.py | 2 | ||||
| -rw-r--r-- | src/Gui/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Gui/ccgui.glade | 1 | ||||
| -rw-r--r-- | src/Hooks/dumpoops.cpp | 4 |
5 files changed, 8 insertions, 4 deletions
diff --git a/src/Gui/CCDump.py b/src/Gui/CCDump.py index 1b06caa7..fe903845 100644 --- a/src/Gui/CCDump.py +++ b/src/Gui/CCDump.py @@ -63,7 +63,7 @@ class Dump(): return self.uid[CD_CONTENT] def getCount(self): - return self.Count[CD_CONTENT] + return int(self.Count[CD_CONTENT]) def getExecutable(self): return self.executable[CD_CONTENT] diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index 74e61ba0..8e8d6939 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -59,7 +59,7 @@ class MainWindow(): UNIX_TIME_COL = 7 DUMP_OBJECT_COL = 8 #icon, package_name, application, date, crash_rate, user, is_reported, time_in_sec ?object? - self.dumpsListStore = gtk.ListStore(gtk.gdk.Pixbuf, str,str,str,str,str,bool, int, object) + self.dumpsListStore = gtk.ListStore(gtk.gdk.Pixbuf, str,str,str,int,str,bool, int, object) self.dlist.set_model(self.dumpsListStore) # add pixbuff separatelly icon_column = gtk.TreeViewColumn(_("Icon")) diff --git a/src/Gui/Makefile.am b/src/Gui/Makefile.am index 04f12926..15df057c 100644 --- a/src/Gui/Makefile.am +++ b/src/Gui/Makefile.am @@ -30,3 +30,6 @@ install-exec-hook: sed 's:/usr/share:$(datadir):g' -i $(DESTDIR)$(bindir)/$$b || exit $$?; \ sed 's:VERSION:@VERSION@:g' -i $(DESTDIR)$(bindir)/$$b || exit $$?; \ done + +install-data-hook: + sed 's:@VER@:$(VERSION):g' -i $(DESTDIR)$(pkgdatadir)/ccgui.glade || exit $$? diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade index 21d6bfef..38bd3d11 100644 --- a/src/Gui/ccgui.glade +++ b/src/Gui/ccgui.glade @@ -11,6 +11,7 @@ <property name="type_hint">dialog</property> <property name="has_separator">False</property> <property name="program_name">ABRT</property> + <property name="version">@VER@</property> <property name="copyright" translatable="yes">(C) 2009 Red Hat, Inc. (C) 2010 Red Hat, Inc.</property> <property name="website">http://fedorahosted.org/abrt/</property> diff --git a/src/Hooks/dumpoops.cpp b/src/Hooks/dumpoops.cpp index ae926198..99ecf009 100644 --- a/src/Hooks/dumpoops.cpp +++ b/src/Hooks/dumpoops.cpp @@ -75,7 +75,7 @@ int main(int argc, char **argv) /* Load KerneloopsScanner plugin */ // const plugin_info_t *plugin_info; CPlugin* (*plugin_newf)(void); - int (*scan_syslog_file)(vector_string_t& oopsList, const char *filename); + int (*scan_syslog_file)(vector_string_t& oopsList, const char *filename, time_t *last_changed_p); void (*save_oops_to_debug_dump)(const vector_string_t& oopsList); void *handle; @@ -96,7 +96,7 @@ int main(int argc, char **argv) /* Use it: parse and dump the oops */ vector_string_t oopsList; - int cnt = scan_syslog_file(oopsList, argv[0]); + int cnt = scan_syslog_file(oopsList, argv[0], NULL); log("found oopses: %d", cnt); if (cnt > 0) { |