← Back to branch summary

~ubuntu-branches/ubuntu/trusty/totem/trusty-proposed

« back to all changes in this revision

Viewing changes to src/totemobject-marshal.c

  • Committer: Bazaar Package Importer
  • Author(s): Sjoerd Simons, Josselin Mouette, Sjoerd Simons, Emilio Pozuelo Monfort
  • Date: 2009-04-19 17:28:51 UTC
  • mfrom: (1.2.52 upstream) (5.1.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090419172851-epoqimnq62akn294
Tags: 2.26.1-1
http://bugs.debian.org/523582
http://bugs.debian.org/523052
[ Josselin Mouette ]
* totem-plugins depends on python-gdbm. Closes: #523582.

[ Sjoerd Simons ]
* New upstream release (2.26.1)
* debian/patches/02_flv.patch: Dropped, fixed upstream
* debian/patches/04_tracker_build.patch: Dropped, fixed upstream
* debian/patches/01_fake_keypresses.patch: Updated and simplified
* debian/patches/70_bbc_plugin.patch: Updated
* debian/patches/90_autotools.patch: Updated

[ Emilio Pozuelo Monfort ]
* Recommend gnome-codec-install rather than gnome-app-install.
  Closes: #523052.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/totemobject-marshal.c
51
51
#endif /* !G_ENABLE_DEBUG */
52
52
 
53
53
 
54
 
/* VOID:STRING,STRING,STRING (./totemobject-marshal.list:1) */
55
 
extern void totemobject_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
56
 
                                                            GValue       *return_value,
57
 
                                                            guint         n_param_values,
58
 
                                                            const GValue *param_values,
59
 
                                                            gpointer      invocation_hint,
60
 
                                                            gpointer      marshal_data);
 
54
/* VOID:STRING,STRING,STRING,UINT (./totemobject-marshal.list:1) */
 
55
extern void totemobject_marshal_VOID__STRING_STRING_STRING_UINT (GClosure     *closure,
 
56
                                                                 GValue       *return_value,
 
57
                                                                 guint         n_param_values,
 
58
                                                                 const GValue *param_values,
 
59
                                                                 gpointer      invocation_hint,
 
60
                                                                 gpointer      marshal_data);
61
61
void
62
 
totemobject_marshal_VOID__STRING_STRING_STRING (GClosure     *closure,
63
 
                                                GValue       *return_value G_GNUC_UNUSED,
64
 
                                                guint         n_param_values,
65
 
                                                const GValue *param_values,
66
 
                                                gpointer      invocation_hint G_GNUC_UNUSED,
67
 
                                                gpointer      marshal_data)
 
62
totemobject_marshal_VOID__STRING_STRING_STRING_UINT (GClosure     *closure,
 
63
                                                     GValue       *return_value G_GNUC_UNUSED,
 
64
                                                     guint         n_param_values,
 
65
                                                     const GValue *param_values,
 
66
                                                     gpointer      invocation_hint G_GNUC_UNUSED,
 
67
                                                     gpointer      marshal_data)
68
68
{
69
 
  typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING) (gpointer     data1,
70
 
                                                           gpointer     arg_1,
71
 
                                                           gpointer     arg_2,
72
 
                                                           gpointer     arg_3,
73
 
                                                           gpointer     data2);
74
 
  register GMarshalFunc_VOID__STRING_STRING_STRING callback;
 
69
  typedef void (*GMarshalFunc_VOID__STRING_STRING_STRING_UINT) (gpointer     data1,
 
70
                                                                gpointer     arg_1,
 
71
                                                                gpointer     arg_2,
 
72
                                                                gpointer     arg_3,
 
73
                                                                guint        arg_4,
 
74
                                                                gpointer     data2);
 
75
  register GMarshalFunc_VOID__STRING_STRING_STRING_UINT callback;
75
76
  register GCClosure *cc = (GCClosure*) closure;
76
77
  register gpointer data1, data2;
77
78
 
78
 
  g_return_if_fail (n_param_values == 4);
 
79
  g_return_if_fail (n_param_values == 5);
79
80
 
80
81
  if (G_CCLOSURE_SWAP_DATA (closure))
81
82
    {
87
88
      data1 = g_value_peek_pointer (param_values + 0);
88
89
      data2 = closure->data;
89
90
    }
90
 
  callback = (GMarshalFunc_VOID__STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
 
91
  callback = (GMarshalFunc_VOID__STRING_STRING_STRING_UINT) (marshal_data ? marshal_data : cc->callback);
91
92
 
92
93
  callback (data1,
93
94
            g_marshal_value_peek_string (param_values + 1),
94
95
            g_marshal_value_peek_string (param_values + 2),
95
96
            g_marshal_value_peek_string (param_values + 3),
 
97
            g_marshal_value_peek_uint (param_values + 4),
96
98
            data2);
97
99
}
98
100