Merge pull request #169 from monsta/csd-must-die

color select dialog: drop CSD/headerbar usage

3 files changed, 0 insertions, 27 deletions

diff --git a/libmate-desktop/mate-colorseldialog.c b/libmate-desktop/mate-colorseldialog.c
index 43ff42f..d35f129 100644
--- a/libmate-desktop/mate-colorseldialog.c
+++ b/libmate-desktop/mate-colorseldialog.c
@@ -185,24 +185,6 @@ mate_color_selection_dialog_new (const gchar *title)
   return GTK_WIDGET (colorseldiag);
 }
 
-// since 1.9.1
-#if GTK_CHECK_VERSION (3, 12, 0)
-GtkWidget*
-mate_color_selection_dialog_new_with_header_bar (const gchar *title)
-{
-  MateColorSelectionDialog *colorseldiag;
-  
-  colorseldiag = g_object_new (MATE_TYPE_COLOR_SELECTION_DIALOG, "use-header-bar", TRUE, NULL);
-
-  if (title)
-    gtk_window_set_title (GTK_WINDOW (colorseldiag), title);
-
-  gtk_window_set_resizable (GTK_WINDOW (colorseldiag), FALSE);
-  
-  return GTK_WIDGET (colorseldiag);
-}
-#endif
-
 /**
  * mate_color_selection_dialog_get_color_selection:
  * @colorsel: a #MateColorSelectionDialog
diff --git a/libmate-desktop/mate-colorseldialog.h b/libmate-desktop/mate-colorseldialog.h
index 5270352..103195f 100644
--- a/libmate-desktop/mate-colorseldialog.h
+++ b/libmate-desktop/mate-colorseldialog.h
@@ -69,9 +69,6 @@ struct _MateColorSelectionDialogClass
 /* ColorSelectionDialog */
 GType      mate_color_selection_dialog_get_type            (void) G_GNUC_CONST;
 GtkWidget* mate_color_selection_dialog_new                 (const gchar *title);
-#if GTK_CHECK_VERSION (3, 12, 0)
-GtkWidget* mate_color_selection_dialog_new_with_header_bar (const gchar *title);
-#endif
 GtkWidget* mate_color_selection_dialog_get_color_selection (MateColorSelectionDialog *colorsel);
 
 
diff --git a/tools/mate-color-select.c b/tools/mate-color-select.c
index 9fad5c0..5870ab3 100644
--- a/tools/mate-color-select.c
+++ b/tools/mate-color-select.c
@@ -59,13 +59,7 @@ main (int argc, char **argv)
     /* initialize GTK+ */
     gtk_init (&argc, &argv);
 
-#if GTK_CHECK_VERSION (3, 12, 0)
-    color_dialog = mate_color_selection_dialog_new_with_header_bar (_("MATE Color Selection"));
-    gtk_header_bar_set_show_close_button (gtk_dialog_get_header_bar (GTK_DIALOG (color_dialog)), TRUE);
-#else
     color_dialog = mate_color_selection_dialog_new (_("MATE Color Selection"));
-#endif
-
     mate_color_selection_set_has_palette (MATE_COLOR_SELECTION_DIALOG (color_dialog)->colorsel, TRUE);
 
     /* quit signal */