← Back to branch summary

~laney/unity-control-center/schemas-depends-not-build-depends

« back to all changes in this revision

Viewing changes to panels/wacom/cc-wacom-panel.c

  • Committer: CI bot
  • Author(s): Robert Ancell
  • Date: 2014-02-19 10:42:01 UTC
  • mfrom: (12708.1.3 wacom-panel-3.8)
  • Revision ID: ps-jenkins@lists.canonical.com-20140219104201-cqfcl33s65vge3yn
Backport Wacom panel from GNOME Control Center 3.8 

Show diffs side-by-side

added added

removed removed

Lines of Context:
panels/wacom/cc-wacom-panel.c
27
27
 
28
28
#include "cc-wacom-panel.h"
29
29
#include "cc-wacom-page.h"
 
30
#include "cc-wacom-resources.h"
30
31
#include "gsd-wacom-device.h"
31
32
 
32
33
#define WID(x) (GtkWidget *) gtk_builder_get_object (priv->builder, x)
337
338
        };
338
339
 
339
340
        priv = self->priv = WACOM_PANEL_PRIVATE (self);
 
341
        g_resources_register (cc_wacom_get_resource ());
340
342
 
341
343
        priv->builder = gtk_builder_new ();
342
344
 
343
 
        gtk_builder_add_objects_from_file (priv->builder,
344
 
                                           GNOMECC_UI_DIR "/gnome-wacom-properties.ui",
345
 
                                           objects,
346
 
                                           &error);
 
345
        gtk_builder_add_objects_from_resource (priv->builder,
 
346
                                               "/org/gnome/control-center/wacom/gnome-wacom-properties.ui",
 
347
                                               objects,
 
348
                                               &error);
347
349
        if (error != NULL)
348
350
        {
349
351
                g_warning ("Error loading UI file: %s", error->message);
360
362
        gtk_widget_set_vexpand (GTK_WIDGET (notebook), TRUE);
361
363
        gtk_container_set_border_width (GTK_CONTAINER (notebook), 0);
362
364
        g_object_set (G_OBJECT (notebook),
363
 
                      "margin-top", 0,
364
 
                      "margin-right", 24,
365
 
                      "margin-left", 24,
366
 
                      "margin-bottom", 24,
 
365
                      "margin-top", 6,
 
366
                      "margin-right", 30,
 
367
                      "margin-left", 30,
 
368
                      "margin-bottom", 30,
367
369
                      NULL);
368
370
 
369
371
        gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (notebook));