diff options
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/helper.c | 5 | ||||
-rw-r--r-- | src/common/logging.c | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/common/helper.c b/src/common/helper.c index c9f218e8..1090fefa 100644 --- a/src/common/helper.c +++ b/src/common/helper.c | |||
@@ -698,8 +698,9 @@ GNUNET_GTK_run_gnunet_setup (gchar * conffile, gboolean run_wizard) | |||
698 | return TRUE; | 698 | return TRUE; |
699 | } | 699 | } |
700 | 700 | ||
701 | GtkWidget *GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml, | 701 | GtkWidget * |
702 | const char *windowName) | 702 | GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml, |
703 | const char *windowName) | ||
703 | { | 704 | { |
704 | GtkContainer *window; | 705 | GtkContainer *window; |
705 | GtkWidget *ret; | 706 | GtkWidget *ret; |
diff --git a/src/common/logging.c b/src/common/logging.c index 355b4f3b..677c4783 100644 --- a/src/common/logging.c +++ b/src/common/logging.c | |||
@@ -38,9 +38,10 @@ init () | |||
38 | if (infoWindowTextView != NULL) | 38 | if (infoWindowTextView != NULL) |
39 | return; | 39 | return; |
40 | infoWindowTextView | 40 | infoWindowTextView |
41 | = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML(), | 41 | = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), |
42 | "messageWindowTextView"); | 42 | "messageWindowTextView"); |
43 | } | 43 | } |
44 | |||
44 | /** | 45 | /** |
45 | * Do not track more than MAX messages | 46 | * Do not track more than MAX messages |
46 | */ | 47 | */ |
@@ -52,7 +53,7 @@ init () | |||
52 | static void * | 53 | static void * |
53 | doInfoMessage (void *args) | 54 | doInfoMessage (void *args) |
54 | { | 55 | { |
55 | char * note = args; | 56 | char *note = args; |
56 | GtkTextIter iter; | 57 | GtkTextIter iter; |
57 | GtkTextBuffer *buffer; | 58 | GtkTextBuffer *buffer; |
58 | GtkTextIter end; | 59 | GtkTextIter end; |
@@ -63,7 +64,7 @@ doInfoMessage (void *args) | |||
63 | gtk_text_buffer_insert (buffer, &iter, note, -1); | 64 | gtk_text_buffer_insert (buffer, &iter, note, -1); |
64 | if (gtk_text_buffer_get_line_count (buffer) >= MAX_LINES) | 65 | if (gtk_text_buffer_get_line_count (buffer) >= MAX_LINES) |
65 | { | 66 | { |
66 | gtk_text_buffer_get_iter_at_line (buffer, &iter, MAX_LINES-1); | 67 | gtk_text_buffer_get_iter_at_line (buffer, &iter, MAX_LINES - 1); |
67 | gtk_text_buffer_get_iter_at_line (buffer, &end, -1); | 68 | gtk_text_buffer_get_iter_at_line (buffer, &end, -1); |
68 | gtk_text_buffer_delete (buffer, &iter, &end); | 69 | gtk_text_buffer_delete (buffer, &iter, &end); |
69 | } | 70 | } |
@@ -79,7 +80,7 @@ void | |||
79 | GNUNET_GTK_show_info_message (const char *format, ...) | 80 | GNUNET_GTK_show_info_message (const char *format, ...) |
80 | { | 81 | { |
81 | va_list args; | 82 | va_list args; |
82 | gchar * note; | 83 | gchar *note; |
83 | 84 | ||
84 | va_start (args, format); | 85 | va_start (args, format); |
85 | note = g_strdup_vprintf (format, args); | 86 | note = g_strdup_vprintf (format, args); |