diff options
Diffstat (limited to 'logview')
-rw-r--r-- | logview/src/logview-app.c | 4 | ||||
-rw-r--r-- | logview/src/logview-app.h | 2 | ||||
-rw-r--r-- | logview/src/logview-filter-manager.c | 26 | ||||
-rw-r--r-- | logview/src/logview-filter-manager.h | 6 | ||||
-rw-r--r-- | logview/src/logview-filter.c | 10 | ||||
-rw-r--r-- | logview/src/logview-filter.h | 10 | ||||
-rw-r--r-- | logview/src/logview-findbar.c | 10 | ||||
-rw-r--r-- | logview/src/logview-log.c | 12 | ||||
-rw-r--r-- | logview/src/logview-log.h | 2 | ||||
-rw-r--r-- | logview/src/logview-loglist.c | 6 | ||||
-rw-r--r-- | logview/src/logview-loglist.h | 2 | ||||
-rw-r--r-- | logview/src/logview-main.c | 4 | ||||
-rw-r--r-- | logview/src/logview-manager.c | 4 | ||||
-rw-r--r-- | logview/src/logview-prefs.c | 6 | ||||
-rw-r--r-- | logview/src/logview-utils.c | 10 | ||||
-rw-r--r-- | logview/src/logview-window.c | 68 |
16 files changed, 91 insertions, 91 deletions
diff --git a/logview/src/logview-app.c b/logview/src/logview-app.c index 6d30e682..ebccf03b 100644 --- a/logview/src/logview-app.c +++ b/logview/src/logview-app.c @@ -184,7 +184,7 @@ enumerate_next_files_async_cb (GObject *source, type = g_file_info_get_file_type (info); content_type = g_file_info_get_content_type (info); name = g_file_info_get_name (info); - + if (!g_file_info_get_attribute_boolean (info, "access::can-read")) { g_object_unref (info); continue; @@ -245,7 +245,7 @@ enumerate_children_async_cb (GObject *source, g_file_enumerator_next_files_async (enumerator, G_MAXINT, G_PRIORITY_DEFAULT, - NULL, enumerate_next_files_async_cb, job); + NULL, enumerate_next_files_async_cb, job); } static void diff --git a/logview/src/logview-app.h b/logview/src/logview-app.h index 3ce7c059..e1a5d021 100644 --- a/logview/src/logview-app.h +++ b/logview/src/logview-app.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - + #ifndef __LOGVIEW_APP_H__ #define __LOGVIEW_APP_H__ diff --git a/logview/src/logview-filter-manager.c b/logview/src/logview-filter-manager.c index c4c5057b..3d2c470e 100644 --- a/logview/src/logview-filter-manager.c +++ b/logview/src/logview-filter-manager.c @@ -63,7 +63,7 @@ logview_filter_manager_update_model (LogviewFilterManager *manager) gtk_list_store_clear (GTK_LIST_STORE (manager->priv->model)); - filters = logview_prefs_get_filters (manager->priv->prefs); + filters = logview_prefs_get_filters (manager->priv->prefs); for (filter = filters; filter != NULL; filter = g_list_next (filter)) { g_object_get (filter->data, "name", &name, NULL); @@ -78,7 +78,7 @@ logview_filter_manager_update_model (LogviewFilterManager *manager) g_free (name); } - g_list_free (filters); + g_list_free (filters); } static gboolean @@ -161,7 +161,7 @@ check_regex (LogviewFilterManager *manager, const gchar *regex) static void on_check_toggled (GtkToggleButton *button, GtkWidget *widget) { - gtk_widget_set_sensitive (widget, + gtk_widget_set_sensitive (widget, gtk_toggle_button_get_active (button)); } @@ -214,7 +214,7 @@ on_dialog_add_edit_reponse (GtkWidget *dialog, int response_id, GdkRGBA foreground_color; gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (color_foreground), &foreground_color); - g_object_set (G_OBJECT (tag), + g_object_set (G_OBJECT (tag), "foreground-rgba", &foreground_color, "foreground-set", TRUE, NULL); } @@ -223,11 +223,11 @@ on_dialog_add_edit_reponse (GtkWidget *dialog, int response_id, GdkRGBA background_color; gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (color_background), &background_color); - g_object_set (tag, + g_object_set (tag, "paragraph-background-rgba", &background_color, "paragraph-background-set", TRUE, NULL); } - + if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_foreground)) && !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_background))) { GtkWidget *error_dialog; @@ -282,7 +282,7 @@ run_add_edit_dialog (LogviewFilterManager *manager, LogviewFilter *filter) error = NULL; name = NULL; - + gtk_builder_add_from_file (builder, UI_FILE, &error); if (error) { @@ -395,7 +395,7 @@ run_add_edit_dialog (LogviewFilterManager *manager, LogviewFilter *filter) static void on_add_clicked (GtkWidget *button, LogviewFilterManager *manager) -{ +{ run_add_edit_dialog (manager, NULL); } @@ -426,7 +426,7 @@ on_remove_clicked (GtkWidget *button, LogviewFilterManager *manager) GtkTreeModel *model; gchar *name; - selection = + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (manager->priv->tree)); gtk_tree_selection_get_selected (selection, &model, &iter); @@ -446,7 +446,7 @@ on_tree_selection_changed (GtkTreeSelection *selection, LogviewFilterManager *ma status = gtk_tree_selection_get_selected (selection, NULL, NULL); gtk_widget_set_sensitive (manager->priv->edit_button, status); - gtk_widget_set_sensitive (manager->priv->remove_button, status); + gtk_widget_set_sensitive (manager->priv->remove_button, status); } static void @@ -521,11 +521,11 @@ logview_filter_manager_init (LogviewFilterManager *manager) gtk_window_set_title (GTK_WINDOW (manager), _("Filters")); - g_signal_connect (priv->add_button, "clicked", + g_signal_connect (priv->add_button, "clicked", G_CALLBACK (on_add_clicked), manager); - g_signal_connect (priv->edit_button, "clicked", + g_signal_connect (priv->edit_button, "clicked", G_CALLBACK (on_edit_clicked), manager); - g_signal_connect (priv->remove_button, "clicked", + g_signal_connect (priv->remove_button, "clicked", G_CALLBACK (on_remove_clicked), manager); gtk_widget_set_sensitive (priv->edit_button, FALSE); diff --git a/logview/src/logview-filter-manager.h b/logview/src/logview-filter-manager.h index c33ea1f7..864ec94c 100644 --- a/logview/src/logview-filter-manager.h +++ b/logview/src/logview-filter-manager.h @@ -2,17 +2,17 @@ /* * mate-utils * Copyright (C) Johannes Schmid 2009 <[email protected]> - * + * * mate-utils is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * mate-utils is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ diff --git a/logview/src/logview-filter.c b/logview/src/logview-filter.c index b5f9cfc6..1a865fa8 100644 --- a/logview/src/logview-filter.c +++ b/logview/src/logview-filter.c @@ -2,17 +2,17 @@ /* * mate-utils * Copyright (C) Johannes Schmid 2009 <[email protected]> - * + * * mate-utils is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * mate-utils is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -42,7 +42,7 @@ struct _LogviewFilterPrivate { (G_TYPE_INSTANCE_GET_PRIVATE ((o), LOGVIEW_TYPE_FILTER, LogviewFilterPrivate)) static void -logview_filter_init (LogviewFilter *object) +logview_filter_init (LogviewFilter *object) { object->priv = LOGVIEW_FILTER_GET_PRIVATE(object); object->priv->tag = NULL; @@ -77,7 +77,7 @@ logview_filter_set_property (GObject *object, guint prop_id, const GValue *value const gchar* regex; err = NULL; - + regex = g_value_get_string (value); priv->regex = g_regex_new (regex, 0, 0, &err); diff --git a/logview/src/logview-filter.h b/logview/src/logview-filter.h index 6eb827b8..a5414259 100644 --- a/logview/src/logview-filter.h +++ b/logview/src/logview-filter.h @@ -2,17 +2,17 @@ /* * mate-utils * Copyright (C) Johannes Schmid 2009 <[email protected]> - * + * * mate-utils is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * mate-utils is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -48,9 +48,9 @@ struct _LogviewFilter { }; GType logview_filter_get_type (void) G_GNUC_CONST; -LogviewFilter * logview_filter_new (const gchar *name, +LogviewFilter * logview_filter_new (const gchar *name, const gchar *regex); -gboolean logview_filter_filter (LogviewFilter *filter, +gboolean logview_filter_filter (LogviewFilter *filter, const gchar *line); GtkTextTag * logview_filter_get_tag (LogviewFilter *filter); diff --git a/logview/src/logview-findbar.c b/logview/src/logview-findbar.c index 846f7de5..5632784f 100644 --- a/logview/src/logview-findbar.c +++ b/logview/src/logview-findbar.c @@ -38,7 +38,7 @@ struct _LogviewFindbarPrivate { GtkToolItem *forward_button; GtkToolItem *status_item; GtkToolItem *separator; - + char *string; guint status_bold_id; @@ -147,14 +147,14 @@ unbold_timeout_cb (gpointer user_data) return FALSE; } -static void +static void logview_findbar_init (LogviewFindbar *findbar) { GtkWidget *label, *w, *box; GtkToolbar *gtoolbar; GtkToolItem *item; LogviewFindbarPrivate *priv; - + priv = findbar->priv = GET_PRIVATE (findbar); gtoolbar = GTK_TOOLBAR (findbar); @@ -341,11 +341,11 @@ logview_findbar_set_message (LogviewFindbar *findbar, pango_font_description_set_weight (desc, PANGO_WEIGHT_BOLD); gtk_widget_override_font (findbar->priv->message, desc); pango_font_description_free (desc); - + findbar->priv->status_bold_id = g_timeout_add (600, unbold_timeout_cb, findbar); } - gtk_label_set_text (GTK_LABEL (findbar->priv->message), + gtk_label_set_text (GTK_LABEL (findbar->priv->message), text != NULL ? text : ""); g_object_set (findbar->priv->separator, "visible", text != NULL, NULL); g_object_set (findbar->priv->status_item, "visible", text != NULL, NULL); diff --git a/logview/src/logview-log.c b/logview/src/logview-log.c index c41889a2..c9a7150e 100644 --- a/logview/src/logview-log.c +++ b/logview/src/logview-log.c @@ -190,7 +190,7 @@ setup_file_monitor (LogviewLog *log) g_error_free (err); return; } - + /* set the rate to 1sec, as I guess it's not unusual to have more than * one line written consequently or in a short time, being a log file. */ @@ -232,7 +232,7 @@ add_new_days_to_cache (LogviewLog *log, const char **new_lines, guint lines_offs log->priv->days = g_slist_append (log->priv->days, logview_utils_day_copy (day)); } else if (res == 0) { last = last_cached->data; - + /* update the lines number */ last->last_line += day->last_line; } @@ -371,7 +371,7 @@ skip_string (GInputStream *is) } while (c != 0); return TRUE; -} +} static gboolean read_gzip_header (GInputStream *is, @@ -407,7 +407,7 @@ read_gzip_header (GInputStream *is, guchar tmp[2]; bytes = g_input_stream_read (is, tmp, 2, NULL, NULL); - + if (bytes != 2) { return FALSE; } @@ -573,7 +573,7 @@ gz_handle_read (GZHandle *gz, } else if (z_result != Z_OK) { gz->last_z_result = z_result; } - + if (gz->last_z_result != Z_OK && zstream->avail_out == num_bytes) { return result_from_z_result (gz->last_z_result); } @@ -725,7 +725,7 @@ log_load (GIOSchedulerJob *io_job, err = create_zlib_error (); goto out; } - + g_object_unref (is); is = real_is; diff --git a/logview/src/logview-log.h b/logview/src/logview-log.h index 4f81af14..5c359195 100644 --- a/logview/src/logview-log.h +++ b/logview/src/logview-log.h @@ -40,7 +40,7 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGVIEW_TYPE_LOG)) #define LOGVIEW_LOG_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGVIEW_TYPE_LOG, LogviewLogClass)) - + typedef struct _LogviewLog LogviewLog; typedef struct _LogviewLogClass LogviewLogClass; typedef struct _LogviewLogPrivate LogviewLogPrivate; diff --git a/logview/src/logview-loglist.c b/logview/src/logview-loglist.c index 847626d9..bc0f1beb 100644 --- a/logview/src/logview-loglist.c +++ b/logview/src/logview-loglist.c @@ -205,7 +205,7 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gtk_tree_model_get (model, &parent, LOG_OBJECT, &log, -1); if (!logview_manager_log_is_active (list->priv->manager, log)) { - save_day_selection (list, &iter); + save_day_selection (list, &iter); logview_manager_set_active_log (list->priv->manager, log); } else { g_signal_emit (list, signals[DAY_SELECTED], 0, day, NULL); @@ -232,7 +232,7 @@ manager_active_changed_cb (LogviewManager *manager, GtkTreeIter * iter, sel_iter; GtkTreeSelection * selection; - if (list->priv->selection && + if (list->priv->selection && gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->model), &sel_iter, list->priv->selection)) { @@ -392,7 +392,7 @@ do_finalize (GObject *obj) G_OBJECT_CLASS (logview_loglist_parent_class)->finalize (obj); } -static void +static void logview_loglist_init (LogviewLoglist *list) { GtkTreeStore *model; diff --git a/logview/src/logview-loglist.h b/logview/src/logview-loglist.h index ebfbf04f..ac6c9544 100644 --- a/logview/src/logview-loglist.h +++ b/logview/src/logview-loglist.h @@ -43,7 +43,7 @@ typedef struct _LogviewLoglist LogviewLoglist; typedef struct _LogviewLoglistClass LogviewLoglistClass; typedef struct _LogviewLoglistPrivate LogviewLoglistPrivate; -struct _LogviewLoglist { +struct _LogviewLoglist { GtkTreeView parent_instance; LogviewLoglistPrivate *priv; }; diff --git a/logview/src/logview-main.c b/logview/src/logview-main.c index 74dcb44b..7eb43b06 100644 --- a/logview/src/logview-main.c +++ b/logview/src/logview-main.c @@ -92,7 +92,7 @@ main (int argc, char *argv[]) g_critical ("Unable to parse arguments: %s", error->message); g_error_free (error); g_option_context_free (context); - + exit (1); } @@ -103,7 +103,7 @@ main (int argc, char *argv[]) if (!app) { g_critical ("Unable to create the user interface."); - + exit (1); } else { g_signal_connect (app, "app-quit", diff --git a/logview/src/logview-manager.c b/logview/src/logview-manager.c index ca1c423f..17d31201 100644 --- a/logview/src/logview-manager.c +++ b/logview/src/logview-manager.c @@ -127,7 +127,7 @@ logview_manager_init (LogviewManager *self) LogviewManagerPrivate *priv = self->priv = GET_PRIVATE (self); priv->active_log = NULL; - priv->logs = g_hash_table_new_full (g_str_hash, g_str_equal, + priv->logs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); } @@ -202,7 +202,7 @@ create_log_cb (LogviewLog *log, g_free (path); } - + if (data->is_multiple) { op->current++; diff --git a/logview/src/logview-prefs.c b/logview/src/logview-prefs.c index 191f90fb..f61e572f 100644 --- a/logview/src/logview-prefs.c +++ b/logview/src/logview-prefs.c @@ -186,8 +186,8 @@ load_filters (LogviewPrefs *prefs) } g_object_set (filter, "texttag", tag, NULL); - g_hash_table_insert (prefs->priv->filters, - g_strdup(tokens[FILTER_NAME]), + g_hash_table_insert (prefs->priv->filters, + g_strdup(tokens[FILTER_NAME]), filter); g_object_ref (filter); @@ -265,7 +265,7 @@ save_filter_foreach_func (gpointer key, gpointer value, gpointer user_data) g_free (regex); g_object_unref (tag); - + g_ptr_array_add (filters, g_string_free (prefs_string, FALSE)); } diff --git a/logview/src/logview-utils.c b/logview/src/logview-utils.c index c8a61ed1..c74ec399 100644 --- a/logview/src/logview-utils.c +++ b/logview/src/logview-utils.c @@ -71,7 +71,7 @@ logview_utils_day_list_copy (GSList *days) return g_slist_reverse (retval); } -gint +gint days_compare (gconstpointer a, gconstpointer b) { const Day *day1 = a, *day2 = b; @@ -85,7 +85,7 @@ string_get_date (const char *line, char **time_string, int *timestamp_len) GDate *date = NULL; struct tm tp; char *cp = NULL, *timestamp = NULL; - + /* it's safe to assume that if strptime returns NULL, it's * because of an error (format unmatched). being a log file, it's very * unlikely that there aren't any more characters after the date. @@ -133,7 +133,7 @@ out: * and are then corrected to the correct year once we * reach the end. * - * Returns: a #GSList of #Day structures. + * Returns: a #GSList of #Day structures. */ GSList * @@ -216,7 +216,7 @@ log_read_dates (const char **buffer_lines, time_t current) } else { /* we can't find the same date here; go back to a safer range. */ rangemax = i; - i = floor (((float) rangemin + (float) i) / 2.); + i = floor (((float) rangemin + (float) i) / 2.); } } @@ -228,7 +228,7 @@ log_read_dates (const char **buffer_lines, time_t current) * of the buffer: reset the parameters for the next day. */ GDate *newdate = NULL; - + for (i = day->last_line + 1; buffer_lines[i]; i++) { if ((newdate = string_get_date (buffer_lines[i], &date_string, ×tamp_len)) != NULL) break; diff --git a/logview/src/logview-window.c b/logview/src/logview-window.c index 602c3572..6a3e4d9d 100644 --- a/logview/src/logview-window.c +++ b/logview/src/logview-window.c @@ -46,7 +46,7 @@ struct _LogviewWindowPrivate { GtkWidget *find_bar; GtkWidget *loglist; - GtkWidget *sidebar; + GtkWidget *sidebar; GtkWidget *version_bar; GtkWidget *version_selector; GtkWidget *hpaned; @@ -129,7 +129,7 @@ static void populate_tag_table (GtkTextTagTable *tag_table) { GtkTextTag *tag; - + tag = gtk_text_tag_new ("bold"); g_object_set (tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL); @@ -142,7 +142,7 @@ populate_tag_table (GtkTextTagTable *tag_table) tag = gtk_text_tag_new ("invisible-filter"); g_object_set (tag, "invisible", TRUE, "invisible-set", TRUE, NULL); - gtk_text_tag_table_add (tag_table, tag); + gtk_text_tag_table_add (tag_table, tag); } static void @@ -217,14 +217,14 @@ logview_update_statusbar (LogviewWindow *logview, LogviewLog *active) modified = g_strdup_printf (_("last update: %s"), timestring_utf8); size = g_format_size (logview_log_get_file_size (active)); - - statusbar_text = g_strdup_printf (_("%d lines (%s) - %s"), + + statusbar_text = g_strdup_printf (_("%d lines (%s) - %s"), logview_log_get_cached_lines_number (active), size, modified); gtk_statusbar_pop (GTK_STATUSBAR (logview->priv->statusbar), 0); gtk_statusbar_push (GTK_STATUSBAR (logview->priv->statusbar), 0, statusbar_text); - + g_free (size); g_free (timestring_utf8); g_free (modified); @@ -371,14 +371,14 @@ logview_bigger_text (GtkAction *action, LogviewWindow *logview) { logview->priv->fontsize = MIN (logview->priv->fontsize + 1, 24); logview_set_fontsize (logview, TRUE); -} +} static void logview_smaller_text (GtkAction *action, LogviewWindow *logview) { logview->priv->fontsize = MAX (logview->priv->fontsize-1, 6); logview_set_fontsize (logview, TRUE); -} +} static void logview_normal_text (GtkAction *action, LogviewWindow *logview) @@ -479,7 +479,7 @@ wrap: } } else { if (wrapped) { - + GtkTextMark *mark; GtkTextIter iter; @@ -535,7 +535,7 @@ text_changed_timeout_cb (gpointer user_data) buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (logview->priv->text_view)); search_start = gtk_text_buffer_get_mark (buffer, SEARCH_START_MARK); search_end = gtk_text_buffer_get_mark (buffer, SEARCH_END_MARK); - + if (search_start) { /* reset the search mark to the start */ gtk_text_buffer_get_start_iter (buffer, &start); @@ -595,7 +595,7 @@ filter_buffer (LogviewWindow *logview, gint start_line) cur_filter = g_list_next (cur_filter)) { if (logview_filter_filter (LOGVIEW_FILTER (cur_filter->data), text)) { - gtk_text_buffer_apply_tag (buffer, + gtk_text_buffer_apply_tag (buffer, logview_filter_get_tag (LOGVIEW_FILTER (cur_filter->data)), &start, end); matched = TRUE; @@ -605,7 +605,7 @@ filter_buffer (LogviewWindow *logview, gint start_line) g_free (text); if (!matched && logview->priv->matches_only) { - gtk_text_buffer_apply_tag_by_name (buffer, + gtk_text_buffer_apply_tag_by_name (buffer, "invisible-filter", &start, end); } else { @@ -621,7 +621,7 @@ filter_buffer (LogviewWindow *logview, gint start_line) static void filter_remove (LogviewWindow *logview, LogviewFilter *filter) { - GtkTextIter start, end; + GtkTextIter start, end; GtkTextBuffer *buffer; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (logview->priv->text_view)); @@ -639,7 +639,7 @@ on_filter_toggled (GtkToggleAction *action, LogviewWindow *logview) LogviewFilter *filter; name = gtk_action_get_name (GTK_ACTION (action)); - + if (gtk_toggle_action_get_active (action)) { priv->active_filters = g_list_append (priv->active_filters, logview_prefs_get_filter (priv->prefs, @@ -694,7 +694,7 @@ update_filter_menu (LogviewWindow *window) } g_list_free (actions); - + filters = logview_prefs_get_filters (logview_prefs_get ()); id = (g_list_length (filters) > 0) ? gtk_ui_manager_new_merge_id (ui) : 0; @@ -713,7 +713,7 @@ update_filter_menu (LogviewWindow *window) gtk_ui_manager_add_ui (ui, id, FILTER_PLACEHOLDER, name, name, GTK_UI_MANAGER_MENUITEM, FALSE); - gtk_text_tag_table_add (table, + gtk_text_tag_table_add (table, logview_filter_get_tag (LOGVIEW_FILTER (l->data))); g_object_unref (action); @@ -726,7 +726,7 @@ update_filter_menu (LogviewWindow *window) } static void -on_logview_filter_manager_response (GtkDialog *dialog, +on_logview_filter_manager_response (GtkDialog *dialog, gint response, LogviewWindow *logview) { @@ -743,10 +743,10 @@ logview_manage_filters (GtkAction *action, LogviewWindow *logview) manager = logview_filter_manager_new (); - g_signal_connect (manager, "response", + g_signal_connect (manager, "response", G_CALLBACK (on_logview_filter_manager_response), logview); - + gtk_window_set_transient_for (GTK_WINDOW (manager), GTK_WINDOW (logview)); gtk_widget_show (GTK_WIDGET (manager)); @@ -821,14 +821,14 @@ static GtkActionEntry entries[] = { { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL }, { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL }, { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL }, - { "FilterMenu", NULL, N_("_Filters"), NULL, NULL, NULL }, + { "FilterMenu", NULL, N_("_Filters"), NULL, NULL, NULL }, { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, - { "OpenLog", "document-open", N_("_Open..."), "<control>O", N_("Open a log from file"), + { "OpenLog", "document-open", N_("_Open..."), "<control>O", N_("Open a log from file"), G_CALLBACK (logview_open_log) }, - { "CloseLog", "window-close", N_("_Close"), "<control>W", N_("Close this log"), + { "CloseLog", "window-close", N_("_Close"), "<control>W", N_("Close this log"), G_CALLBACK (logview_close_log) }, - { "Quit", "application-exit", N_("_Quit"), "<control>Q", N_("Quit the log viewer"), + { "Quit", "application-exit", N_("_Quit"), "<control>Q", N_("Quit the log viewer"), G_CALLBACK (gtk_main_quit) }, { "Copy", "edit-copy", N_("_Copy"), "<control>C", N_("Copy the selection"), @@ -847,24 +847,24 @@ static GtkActionEntry entries[] = { { "FilterManage", NULL, N_("Manage Filters"), NULL, N_("Manage filters"), G_CALLBACK (logview_manage_filters)}, - - { "HelpContents", "help-browser", N_("_Contents"), "F1", N_("Open the help contents for the log viewer"), + + { "HelpContents", "help-browser", N_("_Contents"), "F1", N_("Open the help contents for the log viewer"), G_CALLBACK (logview_help) }, - { "AboutAction", "help-about", N_("_About"), NULL, N_("Show the about dialog for the log viewer"), + { "AboutAction", "help-about", N_("_About"), NULL, N_("Show the about dialog for the log viewer"), G_CALLBACK (logview_about) }, }; static GtkToggleActionEntry toggle_entries[] = { { "ShowStatusBar", NULL, N_("_Statusbar"), NULL, N_("Show Status Bar"), G_CALLBACK (logview_toggle_statusbar), TRUE }, - { "ShowSidebar", NULL, N_("Side _Pane"), "F9", N_("Show Side Pane"), - G_CALLBACK (logview_toggle_sidebar), TRUE }, + { "ShowSidebar", NULL, N_("Side _Pane"), "F9", N_("Show Side Pane"), + G_CALLBACK (logview_toggle_sidebar), TRUE }, { "FilterMatchOnly", NULL, N_("Show matches only"), NULL, N_("Only show lines that match one of the given filters"), G_CALLBACK (logview_toggle_match_filters), FALSE} }; -static gboolean -window_size_changed_cb (GtkWidget *widget, GdkEventConfigure *event, +static gboolean +window_size_changed_cb (GtkWidget *widget, GdkEventConfigure *event, gpointer data) { LogviewWindow *window = data; @@ -1181,7 +1181,7 @@ message_area_create_error_box (LogviewWindow *window, GtkWidget *vbox; GtkWidget *primary_label; GtkWidget *secondary_label; - + hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_widget_show (hbox_content); @@ -1331,7 +1331,7 @@ logview_window_init (LogviewWindow *logview) w = gtk_ui_manager_get_widget (priv->ui_manager, "/LogviewMenu"); gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0); gtk_widget_show (w); - + /* panes */ hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); @@ -1462,7 +1462,7 @@ logview_window_init (LogviewWindow *logview) 1); priv->active_filters = NULL; update_filter_menu (logview); - + gtk_widget_show (vbox); gtk_widget_show (main_view); } @@ -1504,7 +1504,7 @@ logview_window_add_error (LogviewWindow *window, priv = window->priv; message_area_set_labels (window, - primary, secondary); + primary, secondary); gtk_widget_show (priv->message_area); |