← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to libgnome-control-center/cc-marshal.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgnome-control-center/cc-marshal.c
 
1
#include <glib.h>
 
2
#include <glib-object.h>
 
3
#include "cc-marshal.h"
 
4
 
 
5
/* VOID:STRING,POINTER (peditor-marshal.list:25) */
 
6
void
 
7
cc_marshal_VOID__STRING_POINTER (GClosure     *closure,
 
8
                                 GValue       *return_value,
 
9
                                 guint         n_param_values,
 
10
                                 const GValue *param_values,
 
11
                                 gpointer      invocation_hint,
 
12
                                 gpointer      marshal_data)
 
13
{
 
14
  typedef void (*GMarshalFunc_VOID__STRING_POINTER) (gpointer     data1,
 
15
                                                     gpointer     arg_1,
 
16
                                                     gpointer     arg_2,
 
17
                                                     gpointer     data2);
 
18
  register GMarshalFunc_VOID__STRING_POINTER callback;
 
19
  register GCClosure *cc = (GCClosure*) closure;
 
20
  register gpointer data1, data2;
 
21
 
 
22
  g_return_if_fail (n_param_values == 3);
 
23
 
 
24
  if (G_CCLOSURE_SWAP_DATA (closure))
 
25
    {
 
26
      data1 = closure->data;
 
27
      data2 = g_value_peek_pointer (param_values + 0);
 
28
    }
 
29
  else
 
30
    {
 
31
      data1 = g_value_peek_pointer (param_values + 0);
 
32
      data2 = closure->data;
 
33
    }
 
34
  callback = (GMarshalFunc_VOID__STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
 
35
 
 
36
  callback (data1,
 
37
            (char*) g_value_get_string (param_values + 1),
 
38
            g_value_get_pointer (param_values + 2),
 
39
            data2);
 
40
}
 
41