X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon-color-button.h;h=603b16d92f2b119241b40cda81fd0f8aa23c37c9;hb=db9685e21af93630b100473c49d066de0ad3691f;hp=7aa4dd3a46bcd62079539df3a0f4e89490a937ee;hpb=5157d53fef688ef5e766448854b8dbf4b6f8b45b;p=hildon

diff --git a/src/hildon-color-button.h b/src/hildon-color-button.h
index 7aa4dd3..603b16d 100644
--- a/src/hildon-color-button.h
+++ b/src/hildon-color-button.h
@@ -8,7 +8,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,10 +22,12 @@
  *
  */
 
+#ifndef                                         HILDON_DISABLE_DEPRECATED
+
 #ifndef                                         __HILDON_COLOR_BUTTON_H__
 #define                                         __HILDON_COLOR_BUTTON_H__
 
-#include                                        <gtk/gtkbutton.h>
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -83,15 +85,13 @@ hildon_color_button_set_color                   (HildonColorButton *button,
                                                  GdkColor *color);
 
 gboolean
-hildon_color_button_get_is_popped               (HildonColorButton *button);
+hildon_color_button_get_popup_shown             (HildonColorButton *button);
 
 void
-hildon_color_button_pop_up                      (HildonColorButton *button);
+hildon_color_button_popdown                     (HildonColorButton *button);
 
 G_END_DECLS
 
 #endif                                          /* __HILDON_COLOR_BUTTON_H__ */
 
-
-
-
+#endif                                          /* HILDON_DISABLE_DEPRECATED */