gnome-utils r8272 - trunk/logview

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Dec 23 13:26:46 2008
New Revision: 8272
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8272&view=rev

Log:
Remove useless assertions;
Tiny fif for logview_close_log.

Modified:
   trunk/logview/logview.c

Modified: trunk/logview/logview.c
==============================================================================
--- trunk/logview/logview.c	(original)
+++ trunk/logview/logview.c	Tue Dec 23 13:26:46 2008
@@ -96,6 +96,9 @@
 	"	</menubar>"
 	"</ui>";
 
+static void  findbar_close_cb (LogviewFindbar *findbar,
+                               gpointer user_data);
+
 /* private functions */
 
 static void
@@ -166,8 +169,6 @@
   char *size, *modified, *index;
   gulong timestamp;
 
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   if (active == NULL) {
     gtk_statusbar_pop (GTK_STATUSBAR (logview->priv->statusbar), 0);
     return;
@@ -204,8 +205,6 @@
 {
   PangoFontDescription *font_desc;
 
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   if (fontname == NULL)
     fontname = DEFAULT_LOGVIEW_FONT;
 
@@ -222,8 +221,6 @@
   PangoFontDescription *fontdesc;
   PangoContext *context;
   LogviewWindowPrivate *priv = logview->priv;
-	
-  g_assert (LOGVIEW_IS_WINDOW (logview));
 
   context = gtk_widget_get_pango_context (priv->text_view);
   fontdesc = pango_context_get_font_description (context);
@@ -238,8 +235,6 @@
 {
   char *window_title;
 
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   if (log_name) {
     window_title = g_strdup_printf ("%s - %s", log_name, APP_NAME);
   } else {
@@ -269,8 +264,6 @@
   gboolean calendar_active = FALSE;
   GtkWidget *widget;
 
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   log = logview_manager_get_active_log (logview->priv->manager);
 
   if (log) {
@@ -295,8 +288,6 @@
   char *file_uri;
   LogviewLog *log;
 
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   gtk_widget_hide (GTK_WIDGET (chooser));
   if (response != GTK_RESPONSE_OK) {
 	  return;
@@ -353,9 +344,7 @@
 static void
 logview_close_log (GtkAction *action, LogviewWindow *logview)
 {
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
-  gtk_widget_hide (logview->priv->find_bar);
+  findbar_close_cb (LOGVIEW_FINDBAR (logview->priv->find_bar), logview);
   logview_manager_close_active_log (logview->priv->manager);
 }
 
@@ -377,8 +366,6 @@
 static void
 logview_bigger_text (GtkAction *action, LogviewWindow *logview)
 {
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   logview->priv->fontsize = MIN (logview->priv->fontsize + 1, 24);
   logview_set_fontsize (logview);
 }	
@@ -386,8 +373,6 @@
 static void
 logview_smaller_text (GtkAction *action, LogviewWindow *logview)
 {
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   logview->priv->fontsize = MAX (logview->priv->fontsize-1, 6);
   logview_set_fontsize (logview);
 }	
@@ -395,8 +380,6 @@
 static void
 logview_normal_text (GtkAction *action, LogviewWindow *logview)
 {
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   logview->priv->fontsize = logview->priv->original_fontsize;
   logview_set_fontsize (logview);
 }
@@ -433,8 +416,8 @@
 {
   LogviewWindow *logview = user_data;
 
-  gtk_widget_hide (logview->priv->find_bar);
-  logview_findbar_set_message (LOGVIEW_FINDBAR (logview->priv->find_bar), NULL);
+  gtk_widget_hide (GTK_WIDGET (findbar));
+  logview_findbar_set_message (findbar, NULL);
 }
 
 static void
@@ -618,8 +601,6 @@
 static void
 logview_toggle_statusbar (GtkAction *action, LogviewWindow *logview)
 {
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   if (GTK_WIDGET_VISIBLE (logview->priv->statusbar))
     gtk_widget_hide (logview->priv->statusbar);
   else
@@ -629,8 +610,6 @@
 static void
 logview_toggle_sidebar (GtkAction *action, LogviewWindow *logview)
 {
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   if (GTK_WIDGET_VISIBLE (logview->priv->sidebar))
     gtk_widget_hide (logview->priv->sidebar);
   else
@@ -640,8 +619,6 @@
 static void 
 logview_toggle_calendar (GtkAction *action, LogviewWindow *logview)
 {
-  g_assert (LOGVIEW_IS_WINDOW (logview));
-
   if (GTK_WIDGET_VISIBLE (logview->priv->calendar))
     gtk_widget_hide (logview->priv->calendar);
   else {