Merge branch 'kernelshark-devel' into trace-cmd

Conflicts:
	Makefile

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/trace-compat.h b/trace-compat.h
index 1c9126d..ce7759d 100644
--- a/trace-compat.h
+++ b/trace-compat.h
@@ -22,6 +22,7 @@
 #define _TRACE_COMPAT_H
 
 #include <gtk/gtk.h>
+#include <stdarg.h>
 
 #define CALC_GTK_VERSION(maj, min, ext) ((maj << 16) + (min << 8) + ext)
 
@@ -43,12 +44,17 @@ void gtk_menu_item_set_label(GtkMenuItem *menu_item, const gchar *label);
 gdouble gtk_adjustment_get_page_size(GtkAdjustment *adj);
 gdouble gtk_adjustment_get_upper(GtkAdjustment *adj);
 gdouble gtk_adjustment_get_lower(GtkAdjustment *adj);
+gboolean gtk_show_uri(GdkScreen *screen, const gchar *uri,
+                      guint32 timestamp, GError **error);
+
+void g_string_vprintf(GString *string, const gchar *format, va_list args);
 
 #endif /* version < 2.14.0 */
 
 #if GTK_VERSION < CALC_GTK_VERSION(2,12,0)
 
 GtkWidget *gtk_tree_view_column_get_tree_view(GtkTreeViewColumn *col);
+void gtk_widget_set_tooltip_text(GtkWidget *widget, const gchar *text);
 
 #endif /* version < 2.12.0 */