git.tremily.us Git - gentoo.git/blob

   1 diff -uprN mate-power-manager-orig/src/gpm-common.h mate-power-manager/src/gpm-common.h
   2 --- mate-power-manager-orig/src/gpm-common.h    2013-10-03 13:56:55.000000000 +0200
   3 +++ mate-power-manager/src/gpm-common.h 2013-10-13 19:54:10.649901214 +0200
   4 @@ -33,6 +33,7 @@ G_BEGIN_DECLS
   5  #define        GPM_DBUS_SERVICE                "org.mate.PowerManager"
   6  #define        GPM_DBUS_INTERFACE              "org.mate.PowerManager"
   7  #define        GPM_DBUS_INTERFACE_BACKLIGHT    "org.mate.PowerManager.Backlight"
   8 +#define        GPM_DBUS_INTERFACE_KBD_BACKLIGHT        "org.mate.PowerManager.KbdBacklight"
   9  #define        GPM_DBUS_PATH                   "/org/mate/PowerManager"
  10  #define        GPM_DBUS_PATH_BACKLIGHT         "/org/mate/PowerManager/Backlight"
  11  #define GPM_DBUS_PATH_KBD_BACKLIGHT    "/org/mate/PowerManager/KbdBacklight"
  12 diff -uprN mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager/src/gpm-kbd-backlight.c
  13 --- mate-power-manager-orig/src/gpm-kbd-backlight.c     2013-10-03 13:56:55.000000000 +0200
  14 +++ mate-power-manager/src/gpm-kbd-backlight.c  2013-10-13 19:58:07.154258855 +0200
  15 @@ -31,21 +31,6 @@
  16  #include "gpm-kbd-backlight.h"
  17  #include "gsd-media-keys-window.h"
  18
  19 -static const gchar *kbd_backlight_introspection = ""
  20 -"<?xml version=\"1.0\" encoding=\"UTF-8\"?>""<node name=\"/\">"
  21 -  "<interface name=\"org.mate.PowerManager.Backlight\">"
  22 -    "<method name=\"GetBrightness\">"
  23 -      "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
  24 -    "</method>"
  25 -    "<method name=\"SetBrightness\">"
  26 -      "<arg type=\"u\" name=\"percentage_brightness\" direction=\"in\"/>"
  27 -    "</method>"
  28 -    "<signal name=\"BrightnessChanged\">"
  29 -      "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
  30 -    "</signal>"
  31 -  "</interface>"
  32 -"</node>";
  33 -
  34  #define GPM_KBD_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_KBD_BACKLIGHT, GpmKbdBacklightPrivate))
  35
  36  struct GpmKbdBacklightPrivate
  37 @@ -430,40 +415,6 @@ gpm_kbd_backlight_dbus_property_set (GDB
  38     return FALSE;
  39  }
  40
  41 -/**
  42 - * gpm_kbd_backlight_register_dbus:
  43 - * @backlight:
  44 - * @connection:
  45 - * @error:
  46 - **/
  47 -void
  48 -gpm_kbd_backlight_register_dbus (GpmKbdBacklight *backlight,
  49 -                GDBusConnection *connection,
  50 -                GError **error)
  51 -{
  52 -   GDBusNodeInfo *node_info;
  53 -   GDBusInterfaceInfo *interface_info;
  54 -   GDBusInterfaceVTable interface_vtable = {
  55 -           gpm_kbd_backlight_dbus_method_call,
  56 -           gpm_kbd_backlight_dbus_property_get,
  57 -           gpm_kbd_backlight_dbus_property_set
  58 -   };
  59 -
  60 -   node_info = g_dbus_node_info_new_for_xml (kbd_backlight_introspection, NULL);
  61 -   interface_info = g_dbus_node_info_lookup_interface (node_info, GPM_DBUS_INTERFACE_BACKLIGHT);
  62 -
  63 -   backlight->priv->bus_connection = g_object_ref (connection);
  64 -   backlight->priv->bus_object_id =
  65 -       g_dbus_connection_register_object (connection,
  66 -                          GPM_DBUS_PATH_KBD_BACKLIGHT,
  67 -                          interface_info,
  68 -                          &interface_vtable,
  69 -                          backlight,
  70 -                          NULL,
  71 -                          error);
  72 -   g_dbus_node_info_unref (node_info);
  73 -}
  74 -
  75  static gboolean
  76  gpm_kbd_backlight_evaluate_power_source_and_set (GpmKbdBacklight *backlight)
  77  {
  78 diff -uprN mate-power-manager-orig/src/gpm-manager.c mate-power-manager/src/gpm-manager.c
  79 --- mate-power-manager-orig/src/gpm-manager.c   2013-10-03 13:56:55.000000000 +0200
  80 +++ mate-power-manager/src/gpm-manager.c        2013-10-13 20:05:11.449488592 +0200
  81 @@ -63,6 +63,7 @@
  82  #include "gpm-disks.h"
  83
  84  #include "org.mate.PowerManager.Backlight.h"
  85 +#include "org.mate.PowerManager.KbdBacklight.h"
  86
  87  static void     gpm_manager_finalize   (GObject         *object);
  88
  89 @@ -1986,12 +1987,13 @@ gpm_manager_init (GpmManager *manager)
  90                                                      G_OBJECT (manager->priv->backlight));
  91         }
  92
  93 -    manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
  94 -    if (manager->priv->kbd_backlight != NULL) {
  95 -        gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight,
  96 -                                        g_connection,
  97 -                                        NULL);
  98 -    }
  99 +        manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
 100 +        if (manager->priv->kbd_backlight != NULL) {
 101 +            dbus_g_object_type_install_info (GPM_TYPE_KBD_BACKLIGHT,
 102 +                                             &dbus_glib_gpm_kbd_backlight_object_info);
 103 +        dbus_g_connection_register_g_object (connection, GPM_DBUS_PATH_KBD_BACKLIGHT,
 104 +                                             G_OBJECT (manager->priv->kbd_backlight));
 105 +        }
 106
 107         manager->priv->idle = gpm_idle_new ();
 108         g_signal_connect (manager->priv->idle, "idle-changed",
 109 diff -uprN mate-power-manager-orig/src/Makefile.am mate-power-manager/src/Makefile.am
 110 --- mate-power-manager-orig/src/Makefile.am     2013-10-03 13:56:55.000000000 +0200
 111 +++ mate-power-manager/src/Makefile.am  2013-10-13 20:10:17.374533688 +0200
 112 @@ -6,6 +6,7 @@ NULL =
 113  EXTRA_DIST =                                           \
 114         org.mate.PowerManager.xml                       \
 115         org.mate.PowerManager.Backlight.xml             \
 116 +       org.mate.PowerManager.KbdBacklight.xml          \
 117         gpm-marshal.list                                \
 118         $(NULL)
 119
 120 @@ -270,6 +271,7 @@ endif
 121  BUILT_SOURCES =                                        \
 122         org.mate.PowerManager.h                 \
 123         org.mate.PowerManager.Backlight.h               \
 124 +       org.mate.PowerManager.KbdBacklight.h            \
 125         gpm-marshal.c                                   \
 126         gpm-marshal.h                                   \
 127         $(NULL)
 128 @@ -295,6 +297,13 @@ org.mate.PowerManager.Backlight.h: org.m
 129                 --output=org.mate.PowerManager.Backlight.h      \
 130                 $(srcdir)/org.mate.PowerManager.Backlight.xml
 131
 132 +org.mate.PowerManager.KbdBacklight.h: org.mate.PowerManager.KbdBacklight.xml
 133 +       libtool --mode=execute dbus-binding-tool        \
 134 +               --prefix=gpm_kbd_backlight                      \
 135 +               --mode=glib-server                      \
 136 +               --output=org.mate.PowerManager.KbdBacklight.h   \
 137 +               $(srcdir)/org.mate.PowerManager.KbdBacklight.xml
 138 +
 139  clean-local:
 140         rm -f *~
 141         rm -f gpm-marshal.c gpm-marshal.h
 142 diff -uprN mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml
 143 --- mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml  2013-10-13 20:12:11.556667787 +0200
 144 +++ mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml       2013-10-13 20:11:45.972413654 +0200
 145 @@ -0,0 +1,15 @@
 146 +<?xml version="1.0" encoding="UTF-8"?>
 147 +<node name="/">
 148 +  <interface name="org.mate.PowerManager.KbdBacklight">
 149 +    <method name="GetBrightness">
 150 +      <arg type="u" name="percentage_brightness" direction="out"/>
 151 +    </method>
 152 +    <method name="SetBrightness">
 153 +      <arg type="u" name="percentage_brightness" direction="in"/>
 154 +    </method>
 155 +    <signal name="BrightnessChanged">
 156 +      <arg type="u" name="percentage_brightness" direction="out"/>
 157 +    </signal>
 158 +  </interface>
 159 +</node>
 160 +