diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 11:21:21 -0800 |
| commit | eecaa6cf912640153afee8356aabc39c918101c0 (patch) | |
| tree | b0d850afc3ba4865b761764fda84206e6d239f2a /capplets/accessibility/at-properties | |
| parent | 7c719d6bebe37bfff23e6c0b8241ebb94a086e0e (diff) | |
| parent | 52ae123edd9b132d04db6199541a797ecc414015 (diff) | |
| download | mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.bz2 mate-control-center-eecaa6cf912640153afee8356aabc39c918101c0.tar.xz | |
Merge pull request #79 from infirit/1.6
Cherrypick usefull commits from master
Diffstat (limited to 'capplets/accessibility/at-properties')
| -rw-r--r-- | capplets/accessibility/at-properties/Makefile.am | 2 | ||||
| -rw-r--r-- | capplets/accessibility/at-properties/main.c | 1 | ||||
| -rw-r--r-- | capplets/accessibility/at-properties/mate-at-properties.desktop.in.in (renamed from capplets/accessibility/at-properties/at-properties.desktop.in.in) | 0 |
3 files changed, 1 insertions, 2 deletions
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index ecff71a1..178a3165 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -8,7 +8,7 @@ mate_at_properties_LDFLAGS = -export-dynamic @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications -Desktop_in_files = at-properties.desktop.in +Desktop_in_files = mate-at-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) pixmapdir = $(pkgdatadir)/pixmaps diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c index 59160cda..8c62cc1f 100644 --- a/capplets/accessibility/at-properties/main.c +++ b/capplets/accessibility/at-properties/main.c @@ -211,7 +211,6 @@ setup_dialog (GtkBuilder *builder, GSettings *settings) { GtkWidget *widget; GObject *object; - GObject *peditor; object = gtk_builder_get_object (builder, "at_enable_toggle"); g_signal_connect (object, "toggled", diff --git a/capplets/accessibility/at-properties/at-properties.desktop.in.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in index ff4cd37d..ff4cd37d 100644 --- a/capplets/accessibility/at-properties/at-properties.desktop.in.in +++ b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in |