← Back to branch summary

~ubuntu-branches/ubuntu/lucid/libdbusmenu/lucid

« back to all changes in this revision

Viewing changes to libdbusmenu-glib/server-marshal.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2010-01-08 08:42:59 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100108084259-y18hsadt6tqu7yto
Tags: 0.2.0-0ubuntu1
* Upstream release 0.2.0
  - Remove unused libdbusmenu-qt
  - Changing API to be V0.2 for reals
  - Adding underline support
  - Test suite fixes and automation support
  - dbus-dumper tool
  - Switch to org.ayatana
  - Fixing the handling of typed properties, especially bools.
  - Adding GetChildren function for getting a single submenu
  - Starting to watch DBus if the proxy builds fail.
  - Test suite fixes
  - Fixing the consistency between the #defines and what
    was used in the code.
* debian/control, debian/libdbusmenu-tools.install: Setting
  up a package for the new dbusmenu-dumper tool.
* debian/control: Mentioning nicely that this will cause
  indicator-messages << 0.3 and indicator-session << 0.2 to
  break.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdbusmenu-glib/server-marshal.c
47
47
#endif /* !G_ENABLE_DEBUG */
48
48
 
49
49
 
50
 
/* VOID:UINT,STRING,STRING (./server-marshal.list:1) */
 
50
/* VOID:UINT,STRING,POINTER (./server-marshal.list:1) */
51
51
void
52
 
_dbusmenu_server_marshal_VOID__UINT_STRING_STRING (GClosure     *closure,
53
 
                                                   GValue       *return_value G_GNUC_UNUSED,
54
 
                                                   guint         n_param_values,
55
 
                                                   const GValue *param_values,
56
 
                                                   gpointer      invocation_hint G_GNUC_UNUSED,
57
 
                                                   gpointer      marshal_data)
 
52
_dbusmenu_server_marshal_VOID__UINT_STRING_POINTER (GClosure     *closure,
 
53
                                                    GValue       *return_value G_GNUC_UNUSED,
 
54
                                                    guint         n_param_values,
 
55
                                                    const GValue *param_values,
 
56
                                                    gpointer      invocation_hint G_GNUC_UNUSED,
 
57
                                                    gpointer      marshal_data)
58
58
{
59
 
  typedef void (*GMarshalFunc_VOID__UINT_STRING_STRING) (gpointer     data1,
60
 
                                                         guint        arg_1,
61
 
                                                         gpointer     arg_2,
62
 
                                                         gpointer     arg_3,
63
 
                                                         gpointer     data2);
64
 
  register GMarshalFunc_VOID__UINT_STRING_STRING callback;
 
59
  typedef void (*GMarshalFunc_VOID__UINT_STRING_POINTER) (gpointer     data1,
 
60
                                                          guint        arg_1,
 
61
                                                          gpointer     arg_2,
 
62
                                                          gpointer     arg_3,
 
63
                                                          gpointer     data2);
 
64
  register GMarshalFunc_VOID__UINT_STRING_POINTER callback;
65
65
  register GCClosure *cc = (GCClosure*) closure;
66
66
  register gpointer data1, data2;
67
67
 
77
77
      data1 = g_value_peek_pointer (param_values + 0);
78
78
      data2 = closure->data;
79
79
    }
80
 
  callback = (GMarshalFunc_VOID__UINT_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
 
80
  callback = (GMarshalFunc_VOID__UINT_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
81
81
 
82
82
  callback (data1,
83
83
            g_marshal_value_peek_uint (param_values + 1),
84
84
            g_marshal_value_peek_string (param_values + 2),
85
 
            g_marshal_value_peek_string (param_values + 3),
 
85
            g_marshal_value_peek_pointer (param_values + 3),
 
86
            data2);
 
87
}
 
88
 
 
89
/* VOID:INT,UINT (./server-marshal.list:2) */
 
90
void
 
91
_dbusmenu_server_marshal_VOID__INT_UINT (GClosure     *closure,
 
92
                                         GValue       *return_value G_GNUC_UNUSED,
 
93
                                         guint         n_param_values,
 
94
                                         const GValue *param_values,
 
95
                                         gpointer      invocation_hint G_GNUC_UNUSED,
 
96
                                         gpointer      marshal_data)
 
97
{
 
98
  typedef void (*GMarshalFunc_VOID__INT_UINT) (gpointer     data1,
 
99
                                               gint         arg_1,
 
100
                                               guint        arg_2,
 
101
                                               gpointer     data2);
 
102
  register GMarshalFunc_VOID__INT_UINT callback;
 
103
  register GCClosure *cc = (GCClosure*) closure;
 
104
  register gpointer data1, data2;
 
105
 
 
106
  g_return_if_fail (n_param_values == 3);
 
107
 
 
108
  if (G_CCLOSURE_SWAP_DATA (closure))
 
109
    {
 
110
      data1 = closure->data;
 
111
      data2 = g_value_peek_pointer (param_values + 0);
 
112
    }
 
113
  else
 
114
    {
 
115
      data1 = g_value_peek_pointer (param_values + 0);
 
116
      data2 = closure->data;
 
117
    }
 
118
  callback = (GMarshalFunc_VOID__INT_UINT) (marshal_data ? marshal_data : cc->callback);
 
119
 
 
120
  callback (data1,
 
121
            g_marshal_value_peek_int (param_values + 1),
 
122
            g_marshal_value_peek_uint (param_values + 2),
86
123
            data2);
87
124
}
88
125