Removed MAEMO_CHANGES and MAEMO_GTK

4 files changed, 44 insertions, 103 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 663dbdc..651cb72 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -52,14 +52,12 @@ noinst_PROGRAMS   		 	= $(EXAMPLES)
 
 # Hildon window
 hildon_window_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_window_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_window_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_window_example_SOURCES		= hildon-window-example.c
 
 # Hildon stackable window
 hildon_stackable_window_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_stackable_window_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_stackable_window_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_stackable_window_example_SOURCES = hildon-stackable-window-example.c
 
 # Hildon logical color
@@ -70,254 +68,212 @@ hildon_logical_color_example_SOURCES   = hildon-logical-color-example.c
 
 # Hildon wizard dialog
 hildon_wizard_dialog_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_wizard_dialog_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_wizard_dialog_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_wizard_dialog_example_SOURCES	= hildon-wizard-dialog-example.c
 
 # Hildon live search
 hildon_live_search_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_live_search_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_live_search_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_live_search_example_SOURCES	= hildon-live-search-example.c
 
 # Hildon live search in a grid
 hildon_live_search_grid_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_live_search_grid_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_live_search_grid_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_live_search_grid_example_SOURCES	= hildon-live-search-grid-example.c
 
 # Hildon find toolbar
 hildon_find_toolbar_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_find_toolbar_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_find_toolbar_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_find_toolbar_example_SOURCES	= hildon-find-toolbar-example.c
 
 # Hildon edit toolbar
 hildon_edit_toolbar_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_edit_toolbar_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_edit_toolbar_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_edit_toolbar_example_SOURCES	= hildon-edit-toolbar-example.c
 
 # Hildon finger
 hildon_finger_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_finger_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_finger_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_finger_example_SOURCES		= hildon-finger-example.c
 
 # Hildon banner
 hildon_banner_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_banner_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_banner_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_banner_example_SOURCES		= hildon-banner-example.c
 
 # Hildon banner
 hildon_banner_dnd_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_banner_dnd_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_banner_dnd_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_banner_dnd_example_SOURCES	= hildon-banner-dnd-example.c
 
 # Hildon banner long
 hildon_banner_long_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_banner_long_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_banner_long_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_banner_long_example_SOURCES	= hildon-banner-long-example.c
 
 # Hildon caption
 hildon_caption_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_caption_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_caption_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_caption_example_SOURCES		= hildon-caption-example.c
 
 # Hildon note example
 hildon_note_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_note_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_note_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_note_example_SOURCES		= hildon-note-example.c
 
 # Hildon window
 hildon_icon_sizes_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_icon_sizes_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_icon_sizes_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_icon_sizes_example_SOURCES	= hildon-icon-sizes-example.c
 
 # Hildon window menu example
 hildon_window_menu_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_window_menu_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_window_menu_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_window_menu_example_SOURCES	= hildon-window-menu-example.c
 
 # Hildon window common menu example
 hildon_window_cmn_menu_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_window_cmn_menu_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_window_cmn_menu_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_window_cmn_menu_example_SOURCES	= hildon-window-cmn-menu-example.c
 
 # Hildon toolbar example
 hildon_toolbar_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_toolbar_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_toolbar_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_toolbar_example_SOURCES		= hildon-toolbar-example.c
 
 # Hildon lookup example
 hildon_lookup_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_lookup_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_lookup_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_lookup_example_SOURCES		= hildon-lookup-example.c
 
 # Hildon scrolled window
 hildon_scrolled_window_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_scrolled_window_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_scrolled_window_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_scrolled_window_example_SOURCES	= hildon-scrolled-window-example.c
 
 # Hildon pannable area tree view example
 hildon_pannable_area_tree_view_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_tree_view_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-						  	   $(EXTRA_CFLAGS)
+hildon_pannable_area_tree_view_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_tree_view_example_SOURCES		= hildon-pannable-area-tree-view-example.c
 
 # Hildon pannable area tuning example
 hildon_pannable_area_tuning_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_tuning_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-						  	   $(EXTRA_CFLAGS)
+hildon_pannable_area_tuning_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_tuning_example_SOURCES		= hildon-pannable-area-tuning-example.c
 
 # Hildon pannable area scroll jump example
 hildon_pannable_area_scroll_jump_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_scroll_jump_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-							  $(EXTRA_CFLAGS)
+hildon_pannable_area_scroll_jump_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_scroll_jump_example_SOURCES	= hildon-pannable-area-scroll-jump-example.c
 
 # Hildon pannable area buttons scroll example
 hildon_pannable_area_buttons_scroll_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_buttons_scroll_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-								  $(EXTRA_CFLAGS)
+hildon_pannable_area_buttons_scroll_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_buttons_scroll_example_SOURCES		= hildon-pannable-area-buttons-scroll-example.c
 
 # Hildon pannable area gesture signals example
 hildon_pannable_area_gesture_signals_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_gesture_signals_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-								  $(EXTRA_CFLAGS)
+hildon_pannable_area_gesture_signals_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_gesture_signals_example_SOURCES		= hildon-pannable-area-gesture-signals-example.c
 
 # Hildon pannable area initial hint example
 hildon_pannable_area_initial_hint_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_initial_hint_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-							  $(EXTRA_CFLAGS)
+hildon_pannable_area_initial_hint_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_initial_hint_example_SOURCES	= hildon-pannable-area-initial-hint-example.c
 
 # Hildon pannable area touch list
 hildon_pannable_area_touch_list_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_touch_list_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-						  $(EXTRA_CFLAGS)
+hildon_pannable_area_touch_list_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_touch_list_example_SOURCES	= hildon-pannable-area-touch-list-example.c
 
 # Hildon pannable area touch grid
 hildon_pannable_area_touch_grid_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_pannable_area_touch_grid_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-						  $(EXTRA_CFLAGS)
+hildon_pannable_area_touch_grid_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_pannable_area_touch_grid_example_SOURCES	= hildon-pannable-area-touch-grid-example.c
 
 # Hildon app menu
 hildon_app_menu_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_app_menu_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_app_menu_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_app_menu_example_SOURCES		= hildon-app-menu-example.c
 
 # Hildon entry
 hildon_entry_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_entry_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_entry_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_entry_example_SOURCES		= hildon-entry-example.c
 
 # Hildon text view
 hildon_text_view_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_text_view_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_text_view_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_text_view_example_SOURCES	= hildon-text-view-example.c
 
 # Hildon button
 hildon_button_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_button_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_button_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_button_example_SOURCES		= hildon-button-example.c
 
 # Hildon dialog
 hildon_dialog_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_dialog_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_dialog_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_dialog_example_SOURCES		= hildon-dialog-example.c
 
 # Hildon date button
 hildon_date_button_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_date_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_date_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_date_button_example_SOURCES	= hildon-date-button-example.c
 
 # Hildon picker button
 hildon_picker_button_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_picker_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_picker_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_picker_button_example_SOURCES	= hildon-picker-button-example.c
 
 # Hildon picker button with multicolumn picker
 hildon_picker_button_multicolumn_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_picker_button_multicolumn_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-						  $(EXTRA_CFLAGS)
+hildon_picker_button_multicolumn_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_picker_button_multicolumn_example_SOURCES= hildon-picker-button-multicolumn-example.c
 
 # Hildon time button
 hildon_time_button_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_time_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_time_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_time_button_example_SOURCES	= hildon-time-button-example.c
 
 # Hildon check button
 hildon_check_button_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_check_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_check_button_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_check_button_example_SOURCES	= hildon-check-button-example.c
 
 # Hildon touch picker with multiselection
 hildon_touch_selector_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_touch_selector_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  $(EXTRA_CFLAGS)
+hildon_touch_selector_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_touch_selector_example_SOURCES	= hildon-touch-selector-example.c
 
 # Hildon touch picker using HILDON_UI_MODE_NORMAL
 hildon_touch_selector_normal_mode_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_touch_selector_normal_mode_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-							  $(EXTRA_CFLAGS)
+hildon_touch_selector_normal_mode_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_touch_selector_normal_mode_example_SOURCES	= hildon-touch-selector-normal-mode-example.c
 
 # Hildon touch picker with several cells per column
 hildon_touch_selector_multi_cells_example_LDADD		= $(HILDON_OBJ_LIBS)
-hildon_touch_selector_multi_cells_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					  	          $(EXTRA_CFLAGS)
+hildon_touch_selector_multi_cells_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_touch_selector_multi_cells_example_SOURCES	= hildon-touch-selector-multi-cells-example.c
 
 # Hildon touch selector with entry
 hildon_touch_selector_entry_example_LDADD	= $(HILDON_OBJ_LIBS)
-hildon_touch_selector_entry_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					          $(EXTRA_CFLAGS)
+hildon_touch_selector_entry_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_touch_selector_entry_example_SOURCES	= hildon-touch-selector-entry-example.c
 
 # Hildon progress indicator
 hildon_progress_indicator_example_LDADD	        = $(HILDON_OBJ_LIBS)
-hildon_progress_indicator_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)			\
-					          $(EXTRA_CFLAGS)
+hildon_progress_indicator_example_CFLAGS	= $(HILDON_OBJ_CFLAGS)
 hildon_progress_indicator_example_SOURCES	= hildon-progress-indicator-example.c
 
 # Hildon remote texture
 hildon_remote_texture_example_LDADD	        = $(HILDON_OBJ_LIBS)
-hildon_remote_texture_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					          $(EXTRA_CFLAGS)
+hildon_remote_texture_example_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_remote_texture_example_SOURCES		= hildon-remote-texture-example.c
 
 # Hildon remote texture
 hildon_gtk_window_take_screenshot_sync_LDADD	        = $(HILDON_OBJ_LIBS)
-hildon_gtk_window_take_screenshot_sync_CFLAGS		= $(HILDON_OBJ_CFLAGS)			\
-					          $(EXTRA_CFLAGS)
+hildon_gtk_window_take_screenshot_sync_CFLAGS		= $(HILDON_OBJ_CFLAGS)
 hildon_gtk_window_take_screenshot_sync_SOURCES		= hildon-gtk-window-take-screenshot-sync.c
 
 endif
diff --git a/examples/hildon-edit-toolbar-example.c b/examples/hildon-edit-toolbar-example.c
index e8d156d..d3908f7 100644
--- a/examples/hildon-edit-toolbar-example.c
+++ b/examples/hildon-edit-toolbar-example.c
@@ -62,19 +62,11 @@ create_icon_view                                (TreeViewMode  tvmode)
 
   if (tvmode == NORMAL_MODE)
     {
-#ifdef MAEMO_GTK
-      icon_view = hildon_gtk_icon_view_new (HILDON_UI_MODE_NORMAL);
-#else
       icon_view = gtk_icon_view_new ();
-#endif /* MAEMO_GTK */
     }
   else
     {
-#ifdef MAEMO_GTK
-      icon_view = hildon_gtk_icon_view_new (HILDON_UI_MODE_EDIT);
-#else
       icon_view = gtk_icon_view_new ();
-#endif /* MAEMO_GTK */
 
       gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
                                         GTK_SELECTION_MULTIPLE);
diff --git a/examples/hildon-pannable-area-initial-hint-example.c b/examples/hildon-pannable-area-initial-hint-example.c
index 38dc1f9..9312b1b 100644
--- a/examples/hildon-pannable-area-initial-hint-example.c
+++ b/examples/hildon-pannable-area-initial-hint-example.c
@@ -73,11 +73,7 @@ create_content ()
   GtkWidget         *vbox     = NULL;
 
   /* Create a treeview */
-#ifdef MAEMO_GTK
-  tv = hildon_gtk_tree_view_new (HILDON_UI_MODE_NORMAL);
-#else
   tv = gtk_tree_view_new ();
-#endif /* MAEMO_GTK */
 
   renderer = gtk_cell_renderer_text_new ();
   g_object_set (renderer, "width", 1, "xalign", 0.5, NULL);
diff --git a/examples/hildon-wizard-dialog-example.c b/examples/hildon-wizard-dialog-example.c
index 2e8b3c3..57e6e45 100644
--- a/examples/hildon-wizard-dialog-example.c
+++ b/examples/hildon-wizard-dialog-example.c
@@ -77,9 +77,6 @@ main (int argc, char **argv)
     GtkWidget *label_1 = gtk_label_new ("Page 1");
     GtkWidget *label_2 = gtk_label_new ("Page 2");
     GtkWidget *entry_3 = hildon_entry_new (HILDON_SIZE_AUTO);
-#ifdef MAEMO_GTK
-    hildon_gtk_entry_set_placeholder_text (GTK_ENTRY (entry_3), " Write something to continue");
-#endif
     GtkWidget *label_4 = gtk_label_new ("Page 4");
 
     gtk_notebook_append_page (GTK_NOTEBOOK (notebook), label_1, NULL);