Merge branch 'michal-wip'

1 files changed, 0 insertions, 79 deletions

diff --git a/mate-volume-control/src/gvc-combo-box.h b/mate-volume-control/src/gvc-combo-box.h
deleted file mode 100644
index 9a2f425..0000000
--- a/mate-volume-control/src/gvc-combo-box.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2009 Red Hat, Inc.
- * Copyright (C) 2014 Michal Ratajsky <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef __GVC_COMBO_BOX_H
-#define __GVC_COMBO_BOX_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GVC_TYPE_COMBO_BOX         (gvc_combo_box_get_type ())
-#define GVC_COMBO_BOX(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GVC_TYPE_COMBO_BOX, GvcComboBox))
-#define GVC_COMBO_BOX_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GVC_TYPE_COMBO_BOX, GvcComboBoxClass))
-#define GVC_IS_COMBO_BOX(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GVC_TYPE_COMBO_BOX))
-#define GVC_IS_COMBO_BOX_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_COMBO_BOX))
-#define GVC_COMBO_BOX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_COMBO_BOX, GvcComboBoxClass))
-
-typedef struct _GvcComboBox         GvcComboBox;
-typedef struct _GvcComboBoxClass    GvcComboBoxClass;
-typedef struct _GvcComboBoxPrivate  GvcComboBoxPrivate;
-
-struct _GvcComboBox
-{
-#if GTK_CHECK_VERSION (3, 0, 0)
-        GtkBox                  parent;
-#else
-        GtkHBox                 parent;
-#endif
-        GvcComboBoxPrivate     *priv;
-};
-
-struct _GvcComboBoxClass
-{
-#if GTK_CHECK_VERSION (3, 0, 0)
-        GtkBoxClass             parent_class;
-#else
-        GtkHBoxClass            parent_class;
-#endif
-        void (* changed)        (GvcComboBox *combobox,
-                                 const gchar *name);
-        void (* button_clicked) (GvcComboBox *combobox);
-};
-
-GType               gvc_combo_box_get_type            (void) G_GNUC_CONST;
-
-GtkWidget *         gvc_combo_box_new                 (const gchar  *label);
-
-void                gvc_combo_box_set_size_group      (GvcComboBox  *combobox,
-                                                       GtkSizeGroup *group,
-                                                       gboolean      symmetric);
-
-void                gvc_combo_box_set_options         (GvcComboBox  *combobox,
-                                                       const GList  *options);
-void                gvc_combo_box_set_active          (GvcComboBox  *combobox,
-                                                       const gchar  *id);
-
-G_END_DECLS
-
-#endif /* __GVC_COMBO_BOX_H */