[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix function parameter names

noreply at xfce.org noreply at xfce.org
Thu Sep 13 20:20:33 CEST 2018


This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-terminal.

commit 5de7789b2303b93f02dbfb59aa6a3e38c02ee760
Author: Igor <f2404 at yandex.ru>
Date:   Thu Sep 13 14:20:12 2018 -0400

    Fix function parameter names
---
 terminal/terminal-app.c             | 2 +-
 terminal/terminal-encoding-action.c | 2 +-
 terminal/terminal-widget.c          | 8 ++++----
 terminal/terminal-window.c          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/terminal/terminal-app.c b/terminal/terminal-app.c
index 94eacba..d075539 100644
--- a/terminal/terminal-app.c
+++ b/terminal/terminal-app.c
@@ -65,7 +65,7 @@ static gboolean terminal_app_unset_urgent_bell        (TerminalWindow     *windo
 static void     terminal_app_new_window               (TerminalWindow     *window,
                                                        const gchar        *working_directory,
                                                        TerminalApp        *app);
-static void     terminal_app_new_window_with_terminal (TerminalWindow     *window,
+static void     terminal_app_new_window_with_terminal (TerminalWindow     *existing,
                                                        TerminalScreen     *terminal,
                                                        gint                x,
                                                        gint                y,
diff --git a/terminal/terminal-encoding-action.c b/terminal/terminal-encoding-action.c
index 202007f..f0725b8 100644
--- a/terminal/terminal-encoding-action.c
+++ b/terminal/terminal-encoding-action.c
@@ -45,7 +45,7 @@ enum
 static void       terminal_encoding_action_finalize         (GObject                *object);
 static GtkWidget *terminal_encoding_action_create_menu_item (GtkAction              *action);
 static void       terminal_encoding_action_menu_shown       (GtkWidget              *menu,
-                                                             TerminalEncodingAction *encoding_action);
+                                                             TerminalEncodingAction *action);
 
 
 
diff --git a/terminal/terminal-widget.c b/terminal/terminal-widget.c
index b58b11b..d99b344 100644
--- a/terminal/terminal-widget.c
+++ b/terminal/terminal-widget.c
@@ -91,7 +91,7 @@ static void     terminal_widget_drag_data_received    (GtkWidget        *widget,
 static gboolean terminal_widget_key_press_event       (GtkWidget        *widget,
                                                        GdkEventKey      *event);
 static void     terminal_widget_open_uri              (TerminalWidget   *widget,
-                                                       const gchar      *link,
+                                                       const gchar      *wlink,
                                                        gint              tag);
 static void     terminal_widget_update_highlight_urls (TerminalWidget   *widget);
 
@@ -451,7 +451,7 @@ terminal_widget_drag_data_received (GtkWidget        *widget,
                                     gint              y,
                                     GtkSelectionData *selection_data,
                                     guint             info,
-                                    guint32           drag_time)
+                                    guint             time)
 {
   const guint16 *ucs;
   GdkRGBA        color;
@@ -589,7 +589,7 @@ terminal_widget_drag_data_received (GtkWidget        *widget,
       if (G_LIKELY (screen))
         {
           g_signal_emit_by_name (G_OBJECT (screen), "drag-data-received", context,
-                                 x, y, selection_data, info, drag_time);
+                                 x, y, selection_data, info, time);
         }
       break;
 
@@ -599,7 +599,7 @@ terminal_widget_drag_data_received (GtkWidget        *widget,
     }
 
   if (info != TARGET_GTK_NOTEBOOK_TAB)
-    gtk_drag_finish (context, TRUE, FALSE, drag_time);
+    gtk_drag_finish (context, TRUE, FALSE, time);
 }
 
 
diff --git a/terminal/terminal-window.c b/terminal/terminal-window.c
index d0cce6f..8840efc 100644
--- a/terminal/terminal-window.c
+++ b/terminal/terminal-window.c
@@ -1408,7 +1408,7 @@ terminal_window_notebook_drag_data_received (GtkWidget        *widget,
                                              gint              y,
                                              GtkSelectionData *selection_data,
                                              guint             info,
-                                             guint             drag_time,
+                                             guint             time,
                                              TerminalWindow   *window)
 {
   GtkWidget  *notebook;
@@ -1483,7 +1483,7 @@ terminal_window_notebook_drag_data_received (GtkWidget        *widget,
 
   /* finish the drag */
 leave:
-  gtk_drag_finish (context, succeed, FALSE, drag_time);
+  gtk_drag_finish (context, succeed, FALSE, time);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list