Commit ea4f2b15 authored by Rui Matos's avatar Rui Matos Committed by Bastien Nocera
Browse files

display: Remove no longer used .ui file

https://bugzilla.gnome.org/show_bug.cgi?id=708286
parent a401a914
......@@ -3,12 +3,7 @@ cappletname = display
noinst_LTLIBRARIES = libdisplay.la
BUILT_SOURCES = \
cc-display-resources.c \
cc-display-resources.h
libdisplay_la_SOURCES = \
$(BUILT_SOURCES) \
cc-display-panel.c \
cc-display-panel.h \
cc-rr-labeler.c \
......@@ -18,12 +13,6 @@ libdisplay_la_SOURCES = \
libdisplay_la_LIBADD = $(PANEL_LIBS) $(DISPLAY_PANEL_LIBS)
resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/display.gresource.xml)
cc-display-resources.c: display.gresource.xml $(resource_files)
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_display $<
cc-display-resources.h: display.gresource.xml $(resource_files)
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name cc_display $<
# You will need a recent intltool or the patch from this bug
# http://bugzilla.gnome.org/show_bug.cgi?id=462312
@INTLTOOL_POLICY_RULE@
......@@ -49,8 +38,7 @@ INCLUDES = $(PANEL_CFLAGS) \
$(DISPLAY_PANEL_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(Desktop_in_files) $(desktop_DATA) $(BUILT_SOURCES)
EXTRA_DIST = $(resource_files) display.gresource.xml
CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
if MAINTAINER_MODE
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
......
......@@ -19,7 +19,6 @@
*/
#include "cc-display-panel.h"
#include "cc-display-resources.h"
#include <gtk/gtk.h>
#include "scrollarea.h"
......@@ -2270,8 +2269,6 @@ cc_display_panel_init (CcDisplayPanel *self)
GError *error = NULL;
GSettings *settings;
g_resources_register (cc_display_get_resource ());
priv = self->priv = DISPLAY_PANEL_PRIVATE (self);
settings = g_settings_new ("org.gnome.desktop.background");
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/control-center/display">
<file preprocess="xml-stripblanks">display-capplet.ui</file>
</gresource>
</gresources>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment