← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xfce4-terminal/maverick

« back to all changes in this revision

Viewing changes to terminal/terminal-marshal.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-03-07 18:25:16 UTC
  • mfrom: (1.1.13 upstream) (6.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20090307182516-m1ufxagwnyd2fzqt
Tags: 0.2.10-1ubuntu1
https://launchpad.net/bugs/339246
* Merge Xfce 4.6 final from Debian experimental, remaining Ubuntu changes
   (FFe granted, see LP: #339246):
   - debian/patches/xubuntu-change-desktop-category.patch: place terminal
     under Accessories, not System.

Show diffs side-by-side

added added

removed removed

Lines of Context:
terminal/terminal-marshal.c
121
121
            data2);
122
122
}
123
123
 
 
124
/* VOID:OBJECT,INT,INT (terminal-marshal.list:3) */
 
125
void
 
126
_terminal_marshal_VOID__OBJECT_INT_INT (GClosure     *closure,
 
127
                                        GValue       *return_value G_GNUC_UNUSED,
 
128
                                        guint         n_param_values,
 
129
                                        const GValue *param_values,
 
130
                                        gpointer      invocation_hint G_GNUC_UNUSED,
 
131
                                        gpointer      marshal_data)
 
132
{
 
133
  typedef void (*GMarshalFunc_VOID__OBJECT_INT_INT) (gpointer     data1,
 
134
                                                     gpointer     arg_1,
 
135
                                                     gint         arg_2,
 
136
                                                     gint         arg_3,
 
137
                                                     gpointer     data2);
 
138
  register GMarshalFunc_VOID__OBJECT_INT_INT callback;
 
139
  register GCClosure *cc = (GCClosure*) closure;
 
140
  register gpointer data1, data2;
 
141
 
 
142
  g_return_if_fail (n_param_values == 4);
 
143
 
 
144
  if (G_CCLOSURE_SWAP_DATA (closure))
 
145
    {
 
146
      data1 = closure->data;
 
147
      data2 = g_value_peek_pointer (param_values + 0);
 
148
    }
 
149
  else
 
150
    {
 
151
      data1 = g_value_peek_pointer (param_values + 0);
 
152
      data2 = closure->data;
 
153
    }
 
154
  callback = (GMarshalFunc_VOID__OBJECT_INT_INT) (marshal_data ? marshal_data : cc->callback);
 
155
 
 
156
  callback (data1,
 
157
            g_marshal_value_peek_object (param_values + 1),
 
158
            g_marshal_value_peek_int (param_values + 2),
 
159
            g_marshal_value_peek_int (param_values + 3),
 
160
            data2);
 
161
}
 
162