[gtk+/wip/otte/gtk4: 10/41] API: Remove GtkStatusIcon



commit 48b6d451c3182b82bf71bb20f53e558dc2d5d1b0
Author: Benjamin Otte <otte redhat com>
Date:   Sun Sep 4 21:51:09 2016 +0200

    API: Remove GtkStatusIcon

 gtk/Makefile.am                       |    2 -
 gtk/deprecated/Makefile.inc           |    2 -
 gtk/deprecated/gtkstatusicon-quartz.c |  145 --
 gtk/deprecated/gtkstatusicon.c        | 2864 ---------------------------------
 gtk/deprecated/gtkstatusicon.h        |  182 ---
 gtk/deprecated/gtktrayicon-x11.c      | 1100 -------------
 gtk/deprecated/gtktrayicon.h          |   75 -
 gtk/gtk.h                             |    1 -
 tests/Makefile.am                     |    5 -
 tests/teststatusicon.c                |  269 ---
 testsuite/gtk/defaultvalue.c          |    5 -
 testsuite/gtk/notify.c                |    3 -
 12 files changed, 0 insertions(+), 4653 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3b76b82..31558c5 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1023,7 +1023,6 @@ gtk_use_x11_c_sources =   \
        gtkplug.c               \
        gtksocket.c             \
        gtkxembed.c             \
-       deprecated/gtktrayicon-x11.c    \
        gtkapplication-x11.c    \
        gtkmountoperation-x11.c
 
@@ -1047,7 +1046,6 @@ gtk_use_stub_c_sources =  \
        gtkmountoperation-stub.c
 gtk_use_x11_private_h_sources =        \
        gtkxembed.h             \
-       deprecated/gtktrayicon.h        \
        xembed.h
 if USE_X11
 gtk_c_sources += $(gtk_use_x11_c_sources)
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index 7e0e08b..d2afb95 100644
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -23,7 +23,6 @@ deprecated_h_sources =                        \
        deprecated/gtkradioaction.h     \
        deprecated/gtkrc.h              \
        deprecated/gtkrecentaction.h    \
-       deprecated/gtkstatusicon.h      \
        deprecated/gtkstock.h           \
        deprecated/gtkstyle.h           \
        deprecated/gtkstyleproperties.h \
@@ -72,7 +71,6 @@ deprecated_c_sources =                        \
        deprecated/gtkradioaction.c     \
        deprecated/gtkrc.c              \
        deprecated/gtkrecentaction.c    \
-       deprecated/gtkstatusicon.c      \
        deprecated/gtkstock.c           \
        deprecated/gtkstyle.c           \
        deprecated/gtkstyleproperties.c \
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 7b901e1..cdc4648 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -268,7 +268,6 @@
 #include <gtk/deprecated/gtkradioaction.h>
 #include <gtk/deprecated/gtkrc.h>
 #include <gtk/deprecated/gtkrecentaction.h>
-#include <gtk/deprecated/gtkstatusicon.h>
 #include <gtk/deprecated/gtkstock.h>
 #include <gtk/deprecated/gtkstyle.h>
 #include <gtk/deprecated/gtkstyleproperties.h>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 649981f..09c3278 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -117,7 +117,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testselectionmode               \
        $(testsocket_programs)          \
        testspinbutton                  \
-       teststatusicon                  \
        teststockbuttonmenu             \
        testtoolbar                     \
        testtoolbar2                    \
@@ -254,7 +253,6 @@ testselection_DEPENDENCIES = $(TEST_DEPS)
 testsocket_DEPENDENCIES = $(DEPS)
 testsocket_child_DEPENDENCIES = $(DEPS)
 testspinbutton_DEPENDENCIES = $(TEST_DEPS)
-teststatusicon_DEPENDENCIES = $(TEST_DEPS)
 teststockbuttonmenu_DEPENDENCIES = $(TEST_DEPS)
 testtreechanging_DEPENDENCIES =        $(DEPS)
 testtreednd_DEPENDENCIES = $(DEPS)
@@ -408,9 +406,6 @@ testsocket_child_SOURCES =          \
 testspinbutton_SOURCES =       \
        testspinbutton.c
 
-teststatusicon_SOURCES =       \
-       teststatusicon.c
-
 testmerge_SOURCES =            \
        testmerge.c
 
diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index 82b6409..3f13471 100644
--- a/testsuite/gtk/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
@@ -294,11 +294,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
           (strcmp (pspec->name, "adjustment") == 0))
         continue;
 
-      if (g_type_is_a (type, GTK_TYPE_STATUS_ICON) &&
-          (strcmp (pspec->name, "size") == 0 ||
-           strcmp (pspec->name, "screen") == 0))
-        continue;
-
       if (g_type_is_a (type, GTK_TYPE_STYLE_CONTEXT) &&
            strcmp (pspec->name, "screen") == 0)
         continue;
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 1970e00..4c186b9 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -425,9 +425,6 @@ test_type (gconstpointer data)
     return;
 #endif
 
-  if (g_type_is_a (type, GTK_TYPE_STATUS_ICON))
-    return;
-
   klass = g_type_class_ref (type);
 
   if (g_type_is_a (type, GTK_TYPE_SETTINGS))


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