[Xfce4-commits] r30135 - terminal/trunk/terminal

Nick Schermer nick at xfce.org
Thu Jul 2 18:59:35 CEST 2009


Author: nick
Date: 2009-07-02 16:59:34 +0000 (Thu, 02 Jul 2009)
New Revision: 30135

Modified:
   terminal/trunk/terminal/terminal-accel-map.c
   terminal/trunk/terminal/terminal-app.c
   terminal/trunk/terminal/terminal-dbus.c
   terminal/trunk/terminal/terminal-dialogs.c
   terminal/trunk/terminal/terminal-image-loader.c
   terminal/trunk/terminal/terminal-options.c
   terminal/trunk/terminal/terminal-preferences-dialog.c
   terminal/trunk/terminal/terminal-preferences.c
   terminal/trunk/terminal/terminal-private.h
   terminal/trunk/terminal/terminal-screen.c
   terminal/trunk/terminal/terminal-toolbars-view.c
   terminal/trunk/terminal/terminal-widget.c
   terminal/trunk/terminal/terminal-window.c
Log:
Rename the _terminal_{return,assert} functions to terminal_{return,assert}.


Modified: terminal/trunk/terminal/terminal-accel-map.c
===================================================================
--- terminal/trunk/terminal/terminal-accel-map.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-accel-map.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -111,7 +111,7 @@
   guint           accelerator_key;
   gchar          *accelerator;
 
-  _terminal_return_if_fail (g_str_has_prefix (pspec->name, "accel-"));
+  terminal_return_if_fail (g_str_has_prefix (pspec->name, "accel-"));
 
   g_object_get (G_OBJECT (preferences), pspec->name, &accelerator, NULL);
 
@@ -143,8 +143,8 @@
 {
   gchar *property, *name;
 
-  _terminal_return_if_fail (TERMINAL_IS_ACCEL_MAP (map));
-  _terminal_return_if_fail (GTK_IS_ACCEL_MAP (object));
+  terminal_return_if_fail (TERMINAL_IS_ACCEL_MAP (map));
+  terminal_return_if_fail (GTK_IS_ACCEL_MAP (object));
 
   /* only accept window property names */
   if (!g_str_has_prefix (accel_path, "<Actions>/terminal-window/"))
@@ -182,7 +182,7 @@
 {
   GtkAccelMap *gtkmap;
 
-  _terminal_return_if_fail (TERMINAL_IS_ACCEL_MAP (map));
+  terminal_return_if_fail (TERMINAL_IS_ACCEL_MAP (map));
 
   /* monitor the accel map for changes */
   gtkmap = gtk_accel_map_get ();

Modified: terminal/trunk/terminal/terminal-app.c
===================================================================
--- terminal/trunk/terminal/terminal-app.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-app.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -262,9 +262,9 @@
   GtkWidget *window;
   GdkScreen *screen;
 
-  _terminal_return_if_fail (TERMINAL_IS_WINDOW (existing));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (terminal));
-  _terminal_return_if_fail (TERMINAL_IS_APP (app));
+  terminal_return_if_fail (TERMINAL_IS_WINDOW (existing));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (terminal));
+  terminal_return_if_fail (TERMINAL_IS_APP (app));
 
   window = terminal_app_create_window (app, FALSE,
                                        TERMINAL_VISIBILITY_DEFAULT,
@@ -299,7 +299,7 @@
 terminal_app_window_destroyed (GtkWidget   *window,
                                TerminalApp *app)
 {
-  _terminal_return_if_fail (g_list_find (app->windows, window) != NULL);
+  terminal_return_if_fail (g_list_find (app->windows, window) != NULL);
 
   app->windows = g_list_remove (app->windows, window);
 
@@ -335,7 +335,7 @@
 
   if (exo_xsession_client_get_restart_command (client, &oargv, NULL))
     {
-      _terminal_assert (oargv[0] != NULL);
+      terminal_assert (oargv[0] != NULL);
 
       argv[0] = oargv[0];
 
@@ -508,8 +508,8 @@
   gchar           *geometry;
   GList           *lp;
 
-  _terminal_return_if_fail (TERMINAL_IS_APP (app));
-  _terminal_return_if_fail (attr != NULL);
+  terminal_return_if_fail (TERMINAL_IS_APP (app));
+  terminal_return_if_fail (attr != NULL);
 
   window = terminal_app_create_window (app,
                                        attr->fullscreen,

Modified: terminal/trunk/terminal/terminal-dbus.c
===================================================================
--- terminal/trunk/terminal/terminal-dbus.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-dbus.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -172,7 +172,7 @@
   DBusConnection *connection;
   DBusError       derror;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_APP (app), FALSE);
+  terminal_return_val_if_fail (TERMINAL_IS_APP (app), FALSE);
 
   /* check if the application object is already registered */
   connection = g_object_get_data (G_OBJECT (app), "terminal-dbus-connection");
@@ -236,8 +236,8 @@
   DBusMessage    *result;
   DBusError       derror;
 
-  _terminal_return_val_if_fail (argc > 0, FALSE);
-  _terminal_return_val_if_fail (argv != NULL, FALSE);
+  terminal_return_val_if_fail (argc > 0, FALSE);
+  terminal_return_val_if_fail (argv != NULL, FALSE);
 
   dbus_error_init (&derror);
 

Modified: terminal/trunk/terminal/terminal-dialogs.c
===================================================================
--- terminal/trunk/terminal/terminal-dialogs.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-dialogs.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -119,7 +119,7 @@
   va_list    args;
   gchar     *primary_text;
 
-  _terminal_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
+  terminal_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
 
   /* determine the proper parent */
   if (parent == NULL)

Modified: terminal/trunk/terminal/terminal-image-loader.c
===================================================================
--- terminal/trunk/terminal/terminal-image-loader.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-image-loader.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -82,8 +82,8 @@
 {
   TerminalImageLoader *loader = TERMINAL_IMAGE_LOADER (object);
 
-  _terminal_assert (loader->cache == NULL);
-  _terminal_assert (loader->cache_invalid == NULL);
+  terminal_assert (loader->cache == NULL);
+  terminal_assert (loader->cache_invalid == NULL);
 
   g_object_unref (G_OBJECT (loader->preferences));
 
@@ -106,7 +106,7 @@
   gchar                  *selected_color_spec;
   gchar                  *selected_path;
 
-  _terminal_return_if_fail (TERMINAL_IS_IMAGE_LOADER (loader));
+  terminal_return_if_fail (TERMINAL_IS_IMAGE_LOADER (loader));
 
   g_object_get (G_OBJECT (loader->preferences),
                 "background-darkness", &selected_darkness,
@@ -187,7 +187,7 @@
   g_warning ("Pixbuf %p was freed from loader cache %p, "
              "this should not happend",
              pixbuf, loader);
-  _terminal_assert_not_reached ();
+  terminal_assert_not_reached ();
 #endif
 }
 
@@ -457,9 +457,9 @@
   GdkPixbuf *pixbuf;
   GList     *lp;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_IMAGE_LOADER (loader), NULL);
-  _terminal_return_val_if_fail (width > 0, NULL);
-  _terminal_return_val_if_fail (height > 0, NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_IMAGE_LOADER (loader), NULL);
+  terminal_return_val_if_fail (width > 0, NULL);
+  terminal_return_val_if_fail (height > 0, NULL);
 
   terminal_image_loader_check (loader);
 
@@ -528,7 +528,7 @@
       break;
 
     default:
-      _terminal_assert_not_reached ();
+      terminal_assert_not_reached ();
     }
 
   terminal_image_loader_saturate (loader, pixbuf);

Modified: terminal/trunk/terminal/terminal-options.c
===================================================================
--- terminal/trunk/terminal/terminal-options.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-options.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -523,7 +523,7 @@
 void
 terminal_tab_attr_free (TerminalTabAttr *attr)
 {
-  _terminal_return_if_fail (attr != NULL);
+  terminal_return_if_fail (attr != NULL);
 
   g_strfreev (attr->command);
   g_free (attr->directory);
@@ -562,7 +562,7 @@
 void
 terminal_window_attr_free (TerminalWindowAttr *attr)
 {
-  _terminal_return_if_fail (attr != NULL);
+  terminal_return_if_fail (attr != NULL);
 
   g_list_foreach (attr->tabs, (GFunc) terminal_tab_attr_free, NULL);
   g_list_free (attr->tabs);

Modified: terminal/trunk/terminal/terminal-preferences-dialog.c
===================================================================
--- terminal/trunk/terminal/terminal-preferences-dialog.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-preferences-dialog.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -65,7 +65,7 @@
 
 #define BIND_PROPERTIES(name, property) \
   { object = gtk_builder_get_object (GTK_BUILDER (dialog), name); \
-  _terminal_return_if_fail (G_IS_OBJECT (object)); \
+  terminal_return_if_fail (G_IS_OBJECT (object)); \
   exo_mutual_binding_new (G_OBJECT (dialog->preferences), name, \
                           G_OBJECT (object), property); }
 
@@ -122,7 +122,7 @@
 
   /* connect response to dialog */
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "dialog");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   g_object_weak_ref (G_OBJECT (object), (GWeakNotify) g_object_unref, dialog);
   g_signal_connect (G_OBJECT (object), "response",
       G_CALLBACK (terminal_preferences_dialog_response), dialog);
@@ -153,40 +153,40 @@
 
   /* reset comparibility button */
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "reset-compatibility");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   g_signal_connect (G_OBJECT (object), "clicked",
       G_CALLBACK (terminal_preferences_dialog_reset_compat), dialog);
 
   /* add shortcuts editor */
   editor = terminal_shortcut_editor_new ();
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "editor-container");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   gtk_container_add (GTK_CONTAINER (object), editor);
   gtk_widget_show (editor);
 
   /* inverted action between cursor color selections */
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection-use-color");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   exo_binding_new_with_negation (G_OBJECT (dialog->preferences), "color-selection-use-default",
                                  G_OBJECT (object), "active");
 
   /* sensitivity for custom selection color */
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection-use-color");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   object2 = gtk_builder_get_object (GTK_BUILDER (dialog), "color-selection");
-  _terminal_return_if_fail (G_IS_OBJECT (object2));
+  terminal_return_if_fail (G_IS_OBJECT (object2));
   exo_binding_new (G_OBJECT (object), "active", G_OBJECT (object2), "sensitive");
 
   /* background widgets visibility */
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "background-mode");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   g_signal_connect (G_OBJECT (object), "changed",
       G_CALLBACK (terminal_preferences_dialog_background_mode), dialog);
   terminal_preferences_dialog_background_mode (GTK_WIDGET (object), dialog);
 
   /* background image file */
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "background-image-file");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   dialog->signal_id = g_signal_connect (G_OBJECT (dialog->preferences),
       "notify::background-image-file", G_CALLBACK (terminal_preferences_dialog_background_notify), object);
   terminal_preferences_dialog_background_notify (G_OBJECT (dialog->preferences), NULL, object);
@@ -278,17 +278,17 @@
   GObject *object;
   gint     active;
 
-  _terminal_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (dialog));
-  _terminal_return_if_fail (GTK_IS_COMBO_BOX (combobox));
+  terminal_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (dialog));
+  terminal_return_if_fail (GTK_IS_COMBO_BOX (combobox));
 
   active = gtk_combo_box_get_active (GTK_COMBO_BOX (combobox));
 
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "box-file");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   g_object_set (G_OBJECT (object), "visible", active == 1, NULL);
 
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "box-opacity");
-  _terminal_return_if_fail (G_IS_OBJECT (object));
+  terminal_return_if_fail (G_IS_OBJECT (object));
   g_object_set (G_OBJECT (object), "visible", active > 0, NULL);
 }
 
@@ -301,8 +301,8 @@
 {
   gchar *button_file, *prop_file;
 
-  _terminal_return_if_fail (TERMINAL_IS_PREFERENCES (object));
-  _terminal_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (widget));
+  terminal_return_if_fail (TERMINAL_IS_PREFERENCES (object));
+  terminal_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (widget));
 
   button_file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
   g_object_get (G_OBJECT (object), "background-image-file", &prop_file, NULL);
@@ -320,8 +320,8 @@
 {
   gchar *filename;
 
-  _terminal_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (dialog));
-  _terminal_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (widget));
+  terminal_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (dialog));
+  terminal_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (widget));
 
   filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
   g_object_set (G_OBJECT (dialog->preferences), filename, NULL);

Modified: terminal/trunk/terminal/terminal-preferences.c
===================================================================
--- terminal/trunk/terminal/terminal-preferences.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-preferences.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -1354,7 +1354,7 @@
   TerminalPreferences *preferences = TERMINAL_PREFERENCES (object);
   GValue              *src;
 
-  _terminal_return_if_fail (prop_id < N_PROPERTIES);
+  terminal_return_if_fail (prop_id < N_PROPERTIES);
 
   src = preferences->values + prop_id;
   if (G_VALUE_HOLDS (src, pspec->value_type))
@@ -1381,7 +1381,7 @@
   TerminalPreferences *preferences = TERMINAL_PREFERENCES (object);
   GValue              *dst;
 
-  _terminal_return_if_fail (prop_id < N_PROPERTIES);
+  terminal_return_if_fail (prop_id < N_PROPERTIES);
 
   dst = preferences->values + prop_id;
   if (!G_IS_VALUE (dst))
@@ -1480,7 +1480,7 @@
       if (!exo_str_is_equal (option, g_param_spec_get_blurb (spec)))
         {
           g_message ("Blurb does not match option name %s", spec->name);
-          _terminal_assert_not_reached ();
+          terminal_assert_not_reached ();
         }
       g_free (option);
 #endif
@@ -1588,7 +1588,7 @@
       /* when debugging is enabled, check if the generated option name
        * is equal to the blurp, to prevent typos */
       option = property_name_to_option_name (spec->name);
-      _terminal_assert (exo_str_is_equal (option, g_param_spec_get_blurb (spec)));
+      terminal_assert (exo_str_is_equal (option, g_param_spec_get_blurb (spec)));
       g_free (option);
 #endif
 
@@ -1637,9 +1637,9 @@
   GFileInfo *info;
   guint64    mtime = 0;
 
-  _terminal_return_if_fail (G_IS_FILE_MONITOR (monitor));
-  _terminal_return_if_fail (TERMINAL_IS_PREFERENCES (preferences));
-  _terminal_return_if_fail (G_IS_FILE (file));
+  terminal_return_if_fail (G_IS_FILE_MONITOR (monitor));
+  terminal_return_if_fail (TERMINAL_IS_PREFERENCES (preferences));
+  terminal_return_if_fail (G_IS_FILE (file));
 
   /* xfce rc rewrites the file, so skip other events */
   if (G_UNLIKELY (preferences->loading_in_progress))

Modified: terminal/trunk/terminal/terminal-private.h
===================================================================
--- terminal/trunk/terminal/terminal-private.h	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-private.h	2009-07-02 16:59:34 UTC (rev 30135)
@@ -37,15 +37,15 @@
 
 /* support macros for debugging */
 #ifndef NDEBUG
-#define _terminal_assert(expr)                  g_assert (expr)
-#define _terminal_assert_not_reached()          g_assert_not_reached ()
-#define _terminal_return_if_fail(expr)          g_return_if_fail (expr)
-#define _terminal_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
+#define terminal_assert(expr)                  g_assert (expr)
+#define terminal_assert_not_reached()          g_assert_not_reached ()
+#define terminal_return_if_fail(expr)          g_return_if_fail (expr)
+#define terminal_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
 #else
-#define _terminal_assert(expr)                  G_STMT_START{ (void)0; }G_STMT_END
-#define _terminal_assert_not_reached()          G_STMT_START{ (void)0; }G_STMT_END
-#define _terminal_return_if_fail(expr)          G_STMT_START{ (void)0; }G_STMT_END
-#define _terminal_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
+#define terminal_assert(expr)                  G_STMT_START{ (void)0; }G_STMT_END
+#define terminal_assert_not_reached()          G_STMT_START{ (void)0; }G_STMT_END
+#define terminal_return_if_fail(expr)          G_STMT_START{ (void)0; }G_STMT_END
+#define terminal_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
 #endif
 
 /* avoid trivial g_value_get_*() function calls */

Modified: terminal/trunk/terminal/terminal-screen.c
===================================================================
--- terminal/trunk/terminal/terminal-screen.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-screen.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -589,7 +589,7 @@
       break;
 
     default:
-      _terminal_assert_not_reached ();
+      terminal_assert_not_reached ();
     }
 }
 
@@ -621,7 +621,7 @@
       break;
 
     default:
-      _terminal_assert_not_reached ();
+      terminal_assert_not_reached ();
     }
 }
 
@@ -671,9 +671,9 @@
   gboolean             font_allow_bold;
   gchar               *font_name;
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (TERMINAL_IS_PREFERENCES (screen->preferences));
-  _terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_PREFERENCES (screen->preferences));
+  terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
 
   g_object_get (G_OBJECT (screen->preferences),
                 "font-allow-bold", &font_allow_bold,
@@ -815,9 +815,9 @@
 {
   gchar *word_chars;
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (TERMINAL_IS_PREFERENCES (screen->preferences));
-  _terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_PREFERENCES (screen->preferences));
+  terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
 
   g_object_get (G_OBJECT (screen->preferences), "word-chars", &word_chars, NULL);
   if (G_LIKELY (word_chars != NULL))
@@ -833,8 +833,8 @@
 terminal_screen_vte_child_exited (VteTerminal    *terminal,
                                   TerminalScreen *screen)
 {
-  _terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   if (G_LIKELY (!screen->hold))
     gtk_widget_destroy (GTK_WIDGET (screen));
@@ -846,8 +846,8 @@
 terminal_screen_vte_eof (VteTerminal    *terminal,
                          TerminalScreen *screen)
 {
-  _terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   if (G_LIKELY (!screen->hold))
     gtk_widget_destroy (GTK_WIDGET (screen));
@@ -870,8 +870,8 @@
 terminal_screen_vte_selection_changed (VteTerminal    *terminal,
                                        TerminalScreen *screen)
 {
-  _terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   g_signal_emit (G_OBJECT (screen), screen_signals[SELECTION_CHANGED], 0);
 }
@@ -882,8 +882,8 @@
 terminal_screen_vte_window_title_changed (VteTerminal    *terminal,
                                           TerminalScreen *screen)
 {
-  _terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   terminal_screen_update_title (screen);
 }
@@ -919,10 +919,10 @@
   gdouble  timeout;
   GdkColor color;
 
-  _terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (GTK_IS_LABEL (screen->tab_label));
-  _terminal_return_if_fail (TERMINAL_IS_PREFERENCES (screen->preferences));
+  terminal_return_if_fail (VTE_IS_TERMINAL (terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (GTK_IS_LABEL (screen->tab_label));
+  terminal_return_if_fail (TERMINAL_IS_PREFERENCES (screen->preferences));
 
   /* leave if we should not start an update */
   if (GTK_WIDGET_STATE (screen->tab_label) != GTK_STATE_ACTIVE
@@ -960,8 +960,8 @@
   GdkPixbuf           *image;
   gdouble              background_darkness;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
-  _terminal_return_val_if_fail (VTE_IS_TERMINAL (screen->terminal), FALSE);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
+  terminal_return_val_if_fail (VTE_IS_TERMINAL (screen->terminal), FALSE);
 
   GDK_THREADS_ENTER ();
 
@@ -1041,8 +1041,8 @@
   gint        xpad;
   gint        ypad;
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
 
   vte_terminal_get_padding (VTE_TERMINAL (screen->terminal), &xpad, &ypad);
 
@@ -1073,8 +1073,8 @@
   GtkWidget          *box;
 #endif
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (screen->tab_label == NULL || GTK_IS_LABEL (screen->tab_label));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (screen->tab_label == NULL || GTK_IS_LABEL (screen->tab_label));
 
   if (G_UNLIKELY (screen->tab_label == NULL))
     return;
@@ -1102,7 +1102,7 @@
 
 #if GTK_CHECK_VERSION (2, 16, 0)
   box = gtk_widget_get_parent (screen->tab_label);
-  _terminal_return_if_fail (GTK_IS_ORIENTABLE (box));
+  terminal_return_if_fail (GTK_IS_ORIENTABLE (box));
   gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
     angle == 0 ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
 #endif
@@ -1138,7 +1138,7 @@
   gchar  **argv;
   gchar  **env;
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
 #ifdef G_ENABLE_DEBUG
   if (!GTK_WIDGET_REALIZED (screen))
@@ -1181,7 +1181,7 @@
 terminal_screen_set_custom_command (TerminalScreen *screen,
                                     gchar         **command)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   if (G_UNLIKELY (screen->custom_command != NULL))
     g_strfreev (screen->custom_command);
@@ -1203,7 +1203,7 @@
 terminal_screen_set_custom_title (TerminalScreen *screen,
                                   const gchar    *title)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   if (!exo_str_is_equal (screen->custom_title, title))
     {
@@ -1223,7 +1223,7 @@
                           gint           *width_chars,
                           gint           *height_chars)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   if (G_LIKELY (screen != NULL))
     {
@@ -1241,7 +1241,7 @@
                           gint            width_chars,
                           gint            height_chars)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   vte_terminal_set_size (VTE_TERMINAL (screen->terminal),
                          width_chars, height_chars);
@@ -1270,9 +1270,9 @@
   gint           xpad;
   gint           ypad;
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
-  _terminal_return_if_fail (GTK_IS_WINDOW (window));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal));
+  terminal_return_if_fail (GTK_IS_WINDOW (window));
 
   terminal_screen_set_window_geometry_hints (screen, window);
 
@@ -1326,7 +1326,7 @@
   gchar        *title;
   gchar        *tmp;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
 
   if (IS_STRING (screen->custom_title))
     return g_strdup (screen->custom_title);
@@ -1387,7 +1387,7 @@
       break;
 
     default:
-      _terminal_assert_not_reached ();
+      terminal_assert_not_reached ();
       title = NULL;
     }
 
@@ -1415,7 +1415,7 @@
   gchar *cwd;
   gint   length;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
 
   if (screen->pid >= 0)
     {
@@ -1468,8 +1468,8 @@
 terminal_screen_set_working_directory (TerminalScreen *screen,
                                        const gchar    *directory)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (directory != NULL);
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (directory != NULL);
 
   g_free (screen->working_directory);
   screen->working_directory = g_strdup (directory);
@@ -1490,7 +1490,7 @@
 gboolean
 terminal_screen_get_hold (TerminalScreen *screen)
 {
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
   return screen->hold;
 }
 
@@ -1508,7 +1508,7 @@
 terminal_screen_set_hold (TerminalScreen *screen,
                           gboolean        hold)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
   screen->hold = hold;
 }
 
@@ -1526,7 +1526,7 @@
 gboolean
 terminal_screen_has_selection (TerminalScreen *screen)
 {
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
   return vte_terminal_get_has_selection (VTE_TERMINAL (screen->terminal));
 }
 
@@ -1541,7 +1541,7 @@
 void
 terminal_screen_copy_clipboard (TerminalScreen *screen)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
   vte_terminal_copy_clipboard (VTE_TERMINAL (screen->terminal));
 }
 
@@ -1558,7 +1558,7 @@
 void
 terminal_screen_paste_clipboard (TerminalScreen *screen)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
   vte_terminal_paste_clipboard (VTE_TERMINAL (screen->terminal));
 }
 
@@ -1576,7 +1576,7 @@
 void
 terminal_screen_paste_primary (TerminalScreen *screen)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
   vte_terminal_paste_primary (VTE_TERMINAL (screen->terminal));
 }
 
@@ -1593,7 +1593,7 @@
 terminal_screen_reset (TerminalScreen *screen,
                        gboolean        clear)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
   vte_terminal_reset (VTE_TERMINAL (screen->terminal), TRUE, clear);
 }
 
@@ -1612,8 +1612,8 @@
 terminal_screen_im_append_menuitems (TerminalScreen *screen,
                                      GtkMenuShell   *menushell)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
-  _terminal_return_if_fail (GTK_IS_MENU_SHELL (menushell));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (GTK_IS_MENU_SHELL (menushell));
 
   vte_terminal_im_append_menuitems (VTE_TERMINAL (screen->terminal), menushell);
 }
@@ -1632,7 +1632,7 @@
   const gchar *directory;
   GList       *result = NULL;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
 
   if (screen->custom_command != NULL)
     {
@@ -1664,7 +1664,7 @@
 void
 terminal_screen_reset_activity (TerminalScreen *screen)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   if (screen->activity_timeout_id != 0)
     {
@@ -1681,7 +1681,7 @@
   GtkWidget  *hbox;
   GtkWidget  *button, *image;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL);
 
   /* create the box */
   hbox = gtk_hbox_new (FALSE, 0);
@@ -1722,7 +1722,7 @@
 void
 terminal_screen_focus (TerminalScreen *screen)
 {
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   gtk_widget_grab_focus (GTK_WIDGET (screen->terminal));
 }

Modified: terminal/trunk/terminal/terminal-toolbars-view.c
===================================================================
--- terminal/trunk/terminal/terminal-toolbars-view.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-toolbars-view.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -96,7 +96,7 @@
 GtkWidget*
 terminal_toolbars_view_new (GtkUIManager *ui_manager)
 {
-  _terminal_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
+  terminal_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
 
   return g_object_new (TERMINAL_TYPE_TOOLBARS_VIEW,
                        "ui-manager", ui_manager,
@@ -116,7 +116,7 @@
   GtkUIManager      *ui_manager;
   GtkWidget         *toplevel;
 
-  _terminal_return_if_fail (TERMINAL_IS_TOOLBARS_VIEW (toolbar));
+  terminal_return_if_fail (TERMINAL_IS_TOOLBARS_VIEW (toolbar));
 
   exo_toolbars_view_set_editing (EXO_TOOLBARS_VIEW (toolbar), TRUE);
 

Modified: terminal/trunk/terminal/terminal-widget.c
===================================================================
--- terminal/trunk/terminal/terminal-widget.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-widget.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -314,7 +314,7 @@
             pattern_type = regex_patterns[i].type;
             break;
           }
-      _terminal_return_if_fail (pattern_type != PATTERN_TYPE_NONE);
+      terminal_return_if_fail (pattern_type != PATTERN_TYPE_NONE);
 
       /* create menu items with appriorate labels */
       if (pattern_type == PATTERN_TYPE_EMAIL)

Modified: terminal/trunk/terminal/terminal-window.c
===================================================================
--- terminal/trunk/terminal/terminal-window.c	2009-07-02 16:55:18 UTC (rev 30134)
+++ terminal/trunk/terminal/terminal-window.c	2009-07-02 16:59:34 UTC (rev 30135)
@@ -837,7 +837,7 @@
 
   /* get the new active page */
   active = TERMINAL_SCREEN (gtk_notebook_get_nth_page (notebook, page_num));
-  _terminal_return_if_fail (active == NULL || TERMINAL_IS_SCREEN (active));
+  terminal_return_if_fail (active == NULL || TERMINAL_IS_SCREEN (active));
 
   /* only update when really changed */
   if (G_LIKELY (window->active != active))
@@ -885,10 +885,10 @@
   gint            npages;
   gint            width_chars, height_chars;
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (child));
-  _terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
-  _terminal_return_if_fail (GTK_IS_NOTEBOOK (notebook));
-  _terminal_return_if_fail (window->notebook == GTK_WIDGET (notebook));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (child));
+  terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
+  terminal_return_if_fail (GTK_IS_NOTEBOOK (notebook));
+  terminal_return_if_fail (window->notebook == GTK_WIDGET (notebook));
 
   /* connect screen signals */
   g_signal_connect (G_OBJECT (screen), "get-context-menu",
@@ -937,8 +937,8 @@
   gint     npages;
   gboolean show_tabs = TRUE;
 
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (child));
-  _terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (child));
+  terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
 
   /* unset the go menu item */
   g_object_set_qdata (G_OBJECT (child), gomenu_action_quark, NULL);
@@ -995,8 +995,8 @@
   gint       page_num = 0;
   gboolean   close_middle_click;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), FALSE);
-  _terminal_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
+  terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), FALSE);
+  terminal_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
 
   if (event->button == 1)
     {
@@ -1057,8 +1057,8 @@
                                                GdkEventButton *event,
                                                TerminalWindow *window)
 {
-  _terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), FALSE);
-  _terminal_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
+  terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), FALSE);
+  terminal_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), FALSE);
 
   if (G_LIKELY (window->active != NULL))
     terminal_screen_focus (window->active);
@@ -1084,15 +1084,15 @@
   gint        i, n_pages;
   gboolean    succeed = FALSE;
 
-  _terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (widget));
+  terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (widget));
 
   /* check */
   if (G_LIKELY (info == TARGET_GTK_NOTEBOOK_TAB))
     {
       /* get the source notebook (other window) */
       notebook = gtk_drag_get_source_widget (context);
-      _terminal_return_if_fail (GTK_IS_NOTEBOOK (notebook));
+      terminal_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
       /* get the dragged screen */
       screen = (GtkWidget **) selection_data->data;
@@ -1164,9 +1164,9 @@
 {
   TerminalScreen *screen;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
-  _terminal_return_val_if_fail (TERMINAL_IS_SCREEN (child), NULL);
-  _terminal_return_val_if_fail (notebook == GTK_NOTEBOOK (window->notebook), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_SCREEN (child), NULL);
+  terminal_return_val_if_fail (notebook == GTK_NOTEBOOK (window->notebook), NULL);
 
   /* only create new window when there are more then 2 tabs (bug #2686) */
   if (gtk_notebook_get_n_pages (notebook) >= 2)
@@ -1492,8 +1492,8 @@
 {
   gint page;
 
-  _terminal_return_if_fail (GTK_IS_NOTEBOOK (notebook));
-  _terminal_return_if_fail (GTK_IS_RADIO_ACTION (action));
+  terminal_return_if_fail (GTK_IS_NOTEBOOK (notebook));
+  terminal_return_if_fail (GTK_IS_RADIO_ACTION (action));
 
   if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
     {
@@ -1707,8 +1707,8 @@
   GtkWidget  *label;
   gint        page;
 
-  _terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   /* create the tab label */
   label = terminal_screen_get_tab_label (screen);
@@ -1741,8 +1741,8 @@
 terminal_window_remove (TerminalWindow *window,
                         TerminalScreen *screen)
 {
-  _terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
-  _terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
+  terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
+  terminal_return_if_fail (TERMINAL_IS_SCREEN (screen));
 
   gtk_widget_destroy (GTK_WIDGET (screen));
 }
@@ -1761,7 +1761,7 @@
 TerminalScreen *
 terminal_window_get_active (TerminalWindow *window)
 {
-  _terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
   return window->active;
 }
 
@@ -1776,8 +1776,8 @@
 terminal_window_set_startup_id (TerminalWindow     *window,
                                 const gchar        *startup_id)
 {
-  _terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
-  _terminal_return_if_fail (startup_id != NULL);
+  terminal_return_if_fail (TERMINAL_IS_WINDOW (window));
+  terminal_return_if_fail (startup_id != NULL);
 
   g_free (window->startup_id);
   window->startup_id = g_strdup (startup_id);
@@ -1806,7 +1806,7 @@
   gint         w;
   gint         h;
 
-  _terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
+  terminal_return_val_if_fail (TERMINAL_IS_WINDOW (window), NULL);
 
   if (G_LIKELY (window->active != NULL))
     {




More information about the Xfce4-commits mailing list