diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-15 21:35:07 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-15 21:35:07 -0300 |
commit | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (patch) | |
tree | fb2047cbeaa71fabba55e68dc8f5d4838fb5018c /community/cinnamon-control-center/gnomerrlabeler.patch | |
parent | 9f7fb9c12e84f20cd108b933f1a51e216f76cd98 (diff) | |
parent | b90f83b99150003a2022c3a4bbad90b12eb56b7e (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'community/cinnamon-control-center/gnomerrlabeler.patch')
-rw-r--r-- | community/cinnamon-control-center/gnomerrlabeler.patch | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch index b763078ba..b263613c4 100644 --- a/community/cinnamon-control-center/gnomerrlabeler.patch +++ b/community/cinnamon-control-center/gnomerrlabeler.patch @@ -1,6 +1,5 @@ -diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c ---- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.000000000 +0200 -+++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200 +--- cinnamon-control-center-1.8.0.orig/panels/display/cc-display-panel.c 2013-05-05 13:12:28.000000000 +0200 ++++ cinnamon-control-center-1.8.0/panels/display/cc-display-panel.c 2013-05-07 00:27:44.901035877 +0200 @@ -31,12 +31,13 @@ #define GNOME_DESKTOP_USE_UNSTABLE_API #include <libgnome-desktop/gnome-rr.h> @@ -8,7 +7,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c -#include <libgnome-desktop/gnome-rr-labeler.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> - #include <glib/gi18n.h> + #include <glib/gi18n-lib.h> #include <gdesktop-enums.h> +#include "cc-rr-labeler.h" @@ -34,7 +33,7 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c g_object_unref (self->priv->labeler); G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object); -@@ -293,16 +294,16 @@ +@@ -293,14 +294,14 @@ self->priv->current_output = NULL; if (self->priv->labeler) { @@ -43,36 +42,26 @@ diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c g_object_unref (self->priv->labeler); } -- self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); -+ self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration); + self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); if (cc_panel_get_shell (CC_PANEL (self)) == NULL) - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); else -- gnome_rr_labeler_show (self->priv->labeler); -+ cc_rr_labeler_show (self->priv->labeler); + gnome_rr_labeler_show (self->priv->labeler); - select_current_output_from_dialog_position (self); - -@@ -2594,9 +2595,9 @@ - if (self->priv->labeler == NULL) - return; +@@ -2596,7 +2597,7 @@ if (gtk_window_has_toplevel_focus (window)) -- gnome_rr_labeler_show (self->priv->labeler); -+ cc_rr_labeler_show (self->priv->labeler); + gnome_rr_labeler_show (self->priv->labeler); else - gnome_rr_labeler_hide (self->priv->labeler); + cc_rr_labeler_hide (self->priv->labeler); } static void -@@ -2606,9 +2607,9 @@ - if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL) - return; +@@ -2608,7 +2609,7 @@ if (gtk_widget_get_visible (widget)) { -- gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); -+ cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); + gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); } else { - gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); + cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); |