[gnome-panel] clock: remove ClockBox



commit 5a78899faf9055c0ae9b8ba0edd2bc93c0c0d91a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Sep 7 12:33:29 2016 +0300

    clock: remove ClockBox

 applets/clock/clock.c                   |   30 ++----------------------------
 data/theme/Adwaita/gnome-panel-dark.css |    4 +---
 data/theme/Adwaita/gnome-panel.css      |    4 +---
 data/theme/HighContrast/gnome-panel.css |    1 -
 4 files changed, 4 insertions(+), 35 deletions(-)
---
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index c7f96df..ec6ca79 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -163,30 +163,6 @@ static void edit_hide (GtkWidget *unused, ClockData *cd);
 static gboolean edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd);
 static void save_cities_store (ClockData *cd);
 
-/* ClockBox, an instantiable GtkBox */
-
-typedef GtkBox      ClockBox;
-typedef GtkBoxClass ClockBoxClass;
-
-static GType clock_box_get_type (void);
-
-G_DEFINE_TYPE (ClockBox, clock_box, GTK_TYPE_BOX)
-
-static void
-clock_box_init (ClockBox *box)
-{
-}
-
-static void
-clock_box_class_init (ClockBoxClass *klass)
-{
-       GtkWidgetClass *widget_class;
-
-       widget_class = GTK_WIDGET_CLASS (klass);
-
-       gtk_widget_class_set_css_name (widget_class, "clock-box");
-}
-
 /* Clock */
 
 static inline GtkWidget *
@@ -889,14 +865,12 @@ create_clock_widget (ClockData *cd)
         gtk_widget_show (cd->panel_button);
 
         /* Main orientable box */
-        cd->main_obox = g_object_new (clock_box_get_type (), NULL);
-        gtk_box_set_spacing (GTK_BOX (cd->main_obox), 12); /* spacing between weather and time */
+        cd->main_obox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
         gtk_container_add (GTK_CONTAINER (cd->panel_button), cd->main_obox);
         gtk_widget_show (cd->main_obox);
 
         /* Weather orientable box */
-        cd->weather_obox = g_object_new (clock_box_get_type (), NULL);
-        gtk_box_set_spacing (GTK_BOX (cd->weather_obox), 2); /* spacing between weather icon and temperature 
*/
+        cd->weather_obox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
         gtk_box_pack_start (GTK_BOX (cd->main_obox), cd->weather_obox, FALSE, FALSE, 0);
         gtk_widget_set_has_tooltip (cd->weather_obox, TRUE);
         g_signal_connect (cd->weather_obox, "query-tooltip",
diff --git a/data/theme/Adwaita/gnome-panel-dark.css b/data/theme/Adwaita/gnome-panel-dark.css
index 5ba1959..e4e3ed3 100644
--- a/data/theme/Adwaita/gnome-panel-dark.css
+++ b/data/theme/Adwaita/gnome-panel-dark.css
@@ -4,8 +4,7 @@ panel-plug {
 }
 
 .gnome-panel-menu-bar,
-panel-applet > menubar,
-clock-box {
+panel-applet > menubar {
   background: transparent;
   box-shadow: none;
 }
@@ -17,7 +16,6 @@ panel-applet > menubar menuitem:hover {
 
 .gnome-panel-menu-bar > menuitem > label,
 panel-applet > menubar > menuitem > label,
-clock-box label,
 gp-calendar-window label,
 #tasklist-button label,
 #clock-applet-button label,
diff --git a/data/theme/Adwaita/gnome-panel.css b/data/theme/Adwaita/gnome-panel.css
index 5107629..19f8d00 100644
--- a/data/theme/Adwaita/gnome-panel.css
+++ b/data/theme/Adwaita/gnome-panel.css
@@ -4,8 +4,7 @@ panel-plug {
 }
 
 .gnome-panel-menu-bar,
-panel-applet > menubar,
-clock-box {
+panel-applet > menubar {
   background: transparent;
   box-shadow: none;
 }
@@ -17,7 +16,6 @@ panel-applet > menubar menuitem:hover {
 
 .gnome-panel-menu-bar > menuitem > label,
 panel-applet > menubar > menuitem > label,
-clock-box label,
 gp-calendar-window label,
 #tasklist-button label,
 #clock-applet-button label,
diff --git a/data/theme/HighContrast/gnome-panel.css b/data/theme/HighContrast/gnome-panel.css
index feed5cf..1b1e85f 100644
--- a/data/theme/HighContrast/gnome-panel.css
+++ b/data/theme/HighContrast/gnome-panel.css
@@ -16,7 +16,6 @@ panel-applet > menubar menuitem:hover {
 
 .gnome-panel-menu-bar > menuitem > label,
 panel-applet > menubar > menuitem > label,
-clock-box label,
 gp-calendar-window label,
 #tasklist-button label,
 #clock-applet-button label,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]