[maemo-commits] [maemo-commits] r8415 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . libhildondesktop src
From: www-data at stage.maemo.org www-data at stage.maemo.orgDate: Tue Nov 28 17:18:05 EET 2006
- Previous message: [maemo-commits] r8414 - projects/haf/branches/maemo-af-desktop/hildon-desktop/src
- Next message: [maemo-commits] r8416 - projects/haf/tags/hildon-initscripts
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: lucasr Date: 2006-11-28 17:18:04 +0200 (Tue, 28 Nov 2006) New Revision: 8415 Removed: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.h projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.h Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.h projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am Log: 2006-11-28 Lucas Rocha <lucas.rocha at nokia.com> * src/Makefile.am, libhildondesktop/Makefile.am: cleanup and small fixes. * libhildondesktop/hildon-home-window.[ch], libhildondesktop/hildon-home-area.c, libhildondesktop/hildon-plugin-list.[ch], libhildondesktop/hildon-home-select-applets-dialog.[ch]: remove HildonPluginList and applets selection dialog as they are not needed anymore. Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/ChangeLog 2006-11-28 15:18:04 UTC (rev 8415) @@ -1,3 +1,14 @@ +2006-11-28 Lucas Rocha <lucas.rocha at nokia.com> + + * src/Makefile.am, libhildondesktop/Makefile.am: cleanup and small + fixes. + * libhildondesktop/hildon-home-window.[ch], + libhildondesktop/hildon-home-area.c, + libhildondesktop/hildon-plugin-list.[ch], + libhildondesktop/hildon-home-select-applets-dialog.[ch]: remove + HildonPluginList and applets selection dialog as they are not needed + anymore. + 2006-11-27 Lucas Rocha <lucas.rocha at nokia.com> * src/hd-plugin-manager.[ch]: now Plugin Manager just loads/syncs from a Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/Makefile.am 2006-11-28 15:18:04 UTC (rev 8415) @@ -2,134 +2,126 @@ # SUBDIRS = po pkgconfigdir = $(libdir)/pkgconfig -pkgincludedir = $(includedir)/libhildondesktop/libhildondesktop pkgconfig_DATA = libhildondesktop.pc + +pkgincludedir = $(includedir)/libhildondesktop/libhildondesktop pkginclude_HEADERS = \ - hildon-desktop-window.h \ - desktop-panel-window.h \ - desktop-panel.h \ - desktop-multiscreen.h \ - hildon-desktop-item.h \ - hildon-desktop-panel-item.h \ - hildon-desktop-panel-item.h \ - hildon-desktop-item-socket.h \ - statusbar-item-socket.h \ - statusbar-item-wrapper.h \ - statusbar-item.h \ - tasknavigator-item-wrapper.h \ - tasknavigator-item.h \ - libhildonmenu.h \ - hildon-thumb-menu-item.h \ - hildon-home-applet.h \ - hildon-home-area.h \ - hildon-home-window.h \ - hildon-home-select-applets-dialog.h \ - hildon-home-l10n.h \ - hildon-plugin-list.h \ - libhildondesktop.h \ - hn-app-switcher.h + hildon-desktop-window.h \ + hildon-desktop-item.h \ + hildon-desktop-panel-item.h \ + hildon-desktop-panel-item.h \ + hildon-desktop-item-socket.h \ + desktop-panel-window.h \ + desktop-panel.h \ + desktop-multiscreen.h \ + statusbar-item-socket.h \ + statusbar-item-wrapper.h \ + statusbar-item.h \ + tasknavigator-item-wrapper.h \ + tasknavigator-item.h \ + hildon-thumb-menu-item.h \ + hildon-home-applet.h \ + hildon-home-area.h \ + hildon-home-window.h \ + hildon-home-l10n.h \ + libhildondesktop.h \ + hn-app-switcher.h \ + libhildonmenu.h EXTRA_DIST = .empty INCLUDES = \ - $(HILDON_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(GNOME_VFS_CFLAGS) \ - $(OSSO_CFLAGS) \ - $(LIBXML_CFLAGS) \ + $(HILDON_CFLAGS) \ + $(GCONF_CFLAGS) \ + $(GNOME_VFS_CFLAGS) \ + $(OSSO_CFLAGS) \ + $(LIBXML_CFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ - -DDATADIR=\"$(datadir)\" \ + -DDATADIR=\"$(datadir)\" \ -DHILDON_HOME_DESKTOP_ENTRY_DIR=\"$(hildonhomedesktopentrydir)\" \ - -I../libhildonwm + -I$(top_srcdir)/libhildonwm hildon-desktop-marshalers.c: - echo "#include \"hildon-desktop-marshalers.h\"" >|hildon-desktop-marshalers.c - $(LIBTOOL) --mode=execute $(GLIB_GENMARSHAL) hildon-desktop-marshalers.list --body >> hildon-desktop-marshalers.c + $(LIBTOOL) --mode=execute $(GLIB_GENMARSHAL) hildon-desktop-marshalers.list --body --header >> hildon-desktop-marshalers.c hildon-desktop-marshalers.h: $(LIBTOOL) --mode=execute $(GLIB_GENMARSHAL) hildon-desktop-marshalers.list --header >| hildon-desktop-marshalers.h lib_LTLIBRARIES = libhildondesktop.la - APP_SWITCHER_SOURCES = \ - hildon-pixbuf-anim-blinker.c \ - hn-app-menu-item.c \ - hn-app-switcher.c \ - hn-app-button.c \ - hn-app-sound.c \ - hn-app-tooltip.c + hildon-pixbuf-anim-blinker.c \ + hn-app-menu-item.c \ + hn-app-switcher.c \ + hn-app-button.c \ + hn-app-sound.c \ + hn-app-tooltip.c HILDON_HOME_SOURCES = \ - hildon-home-area.c \ - hildon-home-area.h \ - hildon-home-applet.c \ - hildon-home-applet.h \ - hildon-plugin-list.c \ - hildon-plugin-list.h \ - hildon-home-window.c \ - hildon-home-window.h \ - home-applet-handler.c \ - home-applet-handler.h \ - hildon-home-titlebar.c \ - hildon-home-titlebar.h \ - hildon-home-select-applets-dialog.h \ - hildon-home-select-applets-dialog.c \ - hildon-home-l10n.h + hildon-home-area.c \ + hildon-home-area.h \ + hildon-home-applet.c \ + hildon-home-applet.h \ + hildon-home-window.c \ + hildon-home-window.h \ + hildon-home-titlebar.c \ + hildon-home-titlebar.h \ + hildon-home-l10n.h \ + home-applet-handler.c \ + home-applet-handler.h -BUILT_SOURCES = hildon-desktop-marshalers.c \ - hildon-desktop-marshalers.h +BUILT_SOURCES = \ + hildon-desktop-marshalers.c \ + hildon-desktop-marshalers.h - libhildondesktop_la_SOURCES = \ - $(HILDON_HOME_SOURCES) \ - $(BUILT_SOURCES) \ - hildon-desktop-item.h \ - hildon-desktop-item.c \ - hildon-desktop-panel-item.h \ - hildon-desktop-panel-item.c \ + $(HILDON_HOME_SOURCES) \ + $(APP_SWITCHER_SOURCES) \ + $(BUILT_SOURCES) \ + hildon-desktop-item.h \ + hildon-desktop-item.c \ + hildon-desktop-panel-item.h \ + hildon-desktop-panel-item.c \ hildon-desktop-item-socket.h \ hildon-desktop-item-socket.c \ - hildon-desktop-item-plug.h \ - hildon-desktop-item-plug.c \ - hildon-desktop-plugin.h \ - hildon-desktop-plugin.c \ - hildon-desktop-window.h \ - hildon-desktop-window.c \ - desktop-panel.h \ - desktop-panel.c \ - desktop-panel-window.h \ - desktop-panel-window.c \ - statusbar-item.h \ - statusbar-item.c \ - statusbar-item-socket.h \ - statusbar-item-socket.c \ - statusbar-item-binding.h \ - statusbar-item-binding.c \ - statusbar-item-wrapper.h \ - statusbar-item-wrapper.c \ - tasknavigator-item.c \ - tasknavigator-item.h \ - tasknavigator-item-socket.c \ - tasknavigator-item-socket.h \ + hildon-desktop-item-plug.h \ + hildon-desktop-item-plug.c \ + hildon-desktop-plugin.h \ + hildon-desktop-plugin.c \ + hildon-desktop-window.h \ + hildon-desktop-window.c \ + desktop-panel.h \ + desktop-panel.c \ + desktop-panel-window.h \ + desktop-panel-window.c \ + statusbar-item.h \ + statusbar-item.c \ + statusbar-item-socket.h \ + statusbar-item-socket.c \ + statusbar-item-binding.h \ + statusbar-item-binding.c \ + statusbar-item-wrapper.h \ + statusbar-item-wrapper.c \ + tasknavigator-item.c \ + tasknavigator-item.h \ + tasknavigator-item-socket.c \ + tasknavigator-item-socket.h \ tasknavigator-item-wrapper.c \ tasknavigator-item-wrapper.h \ - hildon-log.h \ - hildon-log.c \ - libhildonmenu.h \ - libhildonmenu.c \ - hildon-thumb-menu-item.h \ - hildon-thumb-menu-item.c \ - desktop-multiscreen.h \ - desktop-multiscreen.c \ - $(APP_SWITCHER_SOURCES) + hildon-log.h \ + hildon-log.c \ + libhildonmenu.h \ + libhildonmenu.c \ + hildon-thumb-menu-item.h \ + hildon-thumb-menu-item.c \ + desktop-multiscreen.h \ + desktop-multiscreen.c +libhildondesktop_la_LIBADD = \ + $(HILDON_LIBS) \ + $(HILDONBASELIB_LIBS) \ + $(GCONF_LIBS) \ + $(GNOME_VFS_LIBS) \ + $(top_srcdir)/libhildonwm/libhildonwm.la -libhildondesktop_la_LIBADD = \ - $(HILDON_LIBS) \ - $(HILDONBASELIB_LIBS) \ - $(GCONF_LIBS) \ - $(GNOME_VFS_LIBS) \ - ../libhildonwm/libhildonwm.la - CLEANFILES = *~ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.c 2006-11-28 15:18:04 UTC (rev 8415) @@ -662,153 +662,6 @@ g_key_file_free (keyfile); } -void -hildon_home_area_sync_to_list (HildonHomeArea *area, HildonPluginList *list) -{ - GtkTreeIter i; - GList *applets; - gboolean valid; - - g_return_if_fail (area && list); - - applets = gtk_container_get_children (GTK_CONTAINER (area)); - valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &i); - - while (valid) - { - gchar *desktop_file = NULL; - GtkWidget *applet = NULL; - GList *list_element; - - gtk_tree_model_get (GTK_TREE_MODEL (list), - &i, - HILDON_PLUGIN_LIST_COLUMN_DESKTOP_FILE, - &desktop_file, - -1); - - list_element = g_list_find_custom (applets, - desktop_file, - (GCompareFunc) - hildon_home_applet_find_by_name); - - if (list_element) - applet = GTK_WIDGET (list_element->data); - - gtk_list_store_set (GTK_LIST_STORE (list), - &i, - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - applet? TRUE:FALSE, - -1); - - g_free (desktop_file); - valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list), &i); - } - - g_list_free (applets); -} - -gint -hildon_home_area_sync_from_list (HildonHomeArea *area, HildonPluginList *list) -{ - HildonHomeAreaPriv *priv; - GtkTreeIter i; - GList *applets = NULL; - GSList *applets_to_remove = NULL; - gint x = LAYOUT_AREA_LEFT_BORDER_PADDING; - gint y = LAYOUT_AREA_TOP_BORDER_PADDING; - gboolean valid; - gint n_added = 0; - - g_return_val_if_fail (area && list, n_added); - priv = HILDON_HOME_AREA_GET_PRIVATE (area); - - applets = gtk_container_get_children (GTK_CONTAINER (area)); - valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &i); - - while (valid) - { - gchar *desktop_file = NULL; - gboolean active; - GtkWidget *applet = NULL; - GList *list_element; - - gtk_tree_model_get (GTK_TREE_MODEL (list), - &i, - HILDON_PLUGIN_LIST_COLUMN_DESKTOP_FILE, - &desktop_file, - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - &active, - -1); - - list_element = g_list_find_custom (applets, - desktop_file, - (GCompareFunc) - hildon_home_applet_find_by_name); - - if (list_element) - applet = GTK_WIDGET (list_element->data); - - if (active && !applet) - { - applet = hildon_home_applet_new_with_plugin (desktop_file); - - if (applet) - { - g_signal_emit_by_name (G_OBJECT (area), "applet-selected", applet); - if (x + applet->requisition.width > - GTK_WIDGET (area)->allocation.width - - LAYOUT_AREA_LEFT_BORDER_PADDING - - LAYOUT_AREA_RIGHT_BORDER_PADDING) - x = LAYOUT_AREA_LEFT_BORDER_PADDING; - - if (y + applet->requisition.height > - GTK_WIDGET (area)->allocation.height - - LAYOUT_AREA_TOP_BORDER_PADDING - - LAYOUT_AREA_BOTTOM_BORDER_PADDING) - y = LAYOUT_AREA_TOP_BORDER_PADDING; - - gtk_fixed_put (GTK_FIXED (area), applet, x, y); - g_signal_emit_by_name (G_OBJECT (area), "applet-added", applet); - x += APPLET_ADD_X_STEP; - y += APPLET_ADD_Y_STEP; - - gtk_widget_show (applet); - - n_added ++; - } - } - else if (applet) - { - applets = g_list_remove (applets, applet); - if (!active) - applets_to_remove = g_slist_append (applets_to_remove, applet); - } - - g_free (desktop_file); - valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list), &i); - } - - /* First go to layout mode ... */ - if (n_added) - { - hildon_home_area_set_layout_mode (area, TRUE); - g_signal_emit_by_name (area, "layout-changed"); - } - - /* ... then remove the applets which are no longer active */ - g_slist_foreach (applets_to_remove, - (GFunc)gtk_widget_destroy, - NULL); - /* and finally these which were not in the list */ - g_list_foreach (applets, - (GFunc)gtk_widget_destroy, - NULL); - g_slist_free (applets_to_remove); - g_list_free (applets); - - return n_added; -} - gboolean hildon_home_area_get_layout_changed (HildonHomeArea *area) { Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.h 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-area.h 2006-11-28 15:18:04 UTC (rev 8415) @@ -26,7 +26,6 @@ #define __HILDON_HOME_AREA_H__ #include <gtk/gtkfixed.h> -#include "hildon-plugin-list.h" G_BEGIN_DECLS @@ -80,12 +79,6 @@ void hildon_home_area_load_configuration (HildonHomeArea *area, const gchar *filename); -gint hildon_home_area_sync_from_list (HildonHomeArea *area, - HildonPluginList *list); - -void hildon_home_area_sync_to_list (HildonHomeArea *area, - HildonPluginList *list); - gboolean hildon_home_area_get_layout_changed (HildonHomeArea *area); gboolean hildon_home_area_get_overlaps (HildonHomeArea *area); Deleted: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.c 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.c 2006-11-28 15:18:04 UTC (rev 8415) @@ -1,206 +0,0 @@ -/* - * This file is part of maemo-af-desktop - * - * Copyright (C) 2006 Nokia Corporation. - * - * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> - * Author: Johan Bilien <johan.bilien at nokia.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - - -#include "hildon-home-select-applets-dialog.h" -#include "hildon-plugin-list.h" -#include "hildon-home-l10n.h" - -/*#include <osso-helplib.h>*/ -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtktreeview.h> -#include <gtk/gtkcellrenderertoggle.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtktreeselection.h> -#include <gdk/gdkkeysyms.h> - -/* FIXME */ -#define DIALOG_WIDTH 400 - -static -void hildon_home_select_applets_dialog_applet_toggled - (GtkCellRendererToggle *cell_renderer, - gchar *path, - gpointer user_data); - -static gboolean -hildon_home_select_applets_dialog_key_press_event (GtkWidget *widget, - GdkEventKey *event); - - - - -GtkWidget * -hildon_home_select_applets_dialog_new_with_model (GtkTreeModel *model, - osso_context_t *osso_home) -{ - GtkWidget *dialog; - GtkWidget *scrollwindow; - GtkWidget *treeview; - GtkCellRenderer *cell_renderer; - - dialog = gtk_dialog_new_with_buttons (HOME_APPLETS_SELECT_TITLE, - NULL, - GTK_DIALOG_MODAL | - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, - HOME_APPLETS_SELECT_OK, - GTK_RESPONSE_OK, - HOME_APPLETS_SELECT_CANCEL, - GTK_RESPONSE_CANCEL, - NULL); - - gtk_widget_set_size_request (dialog, DIALOG_WIDTH, -1); - -#if 0 - /* Add help button to the dialog */ - ossohelp_dialog_help_enable (GTK_DIALOG(dialog), - HH_HELP_SELECT_APPLETS, - osso_home); -#endif - - scrollwindow = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwindow), - GTK_SHADOW_ETCHED_IN); - - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwindow), - GTK_POLICY_NEVER, - GTK_POLICY_NEVER); - - treeview = gtk_tree_view_new_with_model (model); - g_object_set (treeview, "allow-checkbox-mode", FALSE, NULL); - - cell_renderer = gtk_cell_renderer_toggle_new (); - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), - -1, - NULL, - cell_renderer, - "active", - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - NULL); - g_object_set (cell_renderer, "activatable", TRUE, NULL); - - g_signal_connect (G_OBJECT (cell_renderer), "toggled", - G_CALLBACK ( - hildon_home_select_applets_dialog_applet_toggled), - model); - - gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(treeview), - -1, - NULL, - gtk_cell_renderer_text_new(), - "text", - HILDON_PLUGIN_LIST_COLUMN_NAME, - NULL); - - gtk_container_add (GTK_CONTAINER (scrollwindow), treeview); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), scrollwindow); - - /* Work around Hildon GTK bug */ - g_signal_connect (G_OBJECT (treeview), "key-press-event", - G_CALLBACK ( - hildon_home_select_applets_dialog_key_press_event), - NULL); - - gtk_widget_show_all (GTK_DIALOG (dialog)->vbox); - - return dialog; -} - -static -void hildon_home_select_applets_dialog_applet_toggled - (GtkCellRendererToggle *cell_renderer, - gchar *path, - gpointer user_data) -{ - GtkTreeIter iter; - gboolean active; - - /* Get the GtkTreeModel iter */ - GtkTreeModel *model = GTK_TREE_MODEL (user_data); - - if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) - { - return; - } - - /* Get boolean value */ - gtk_tree_model_get (model, - &iter, - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - &active, - -1); - - /* Change the iter value on the TreeModel */ - gtk_list_store_set (GTK_LIST_STORE (model), - &iter, - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - !active, - -1); -} - -static gboolean -hildon_home_select_applets_dialog_key_press_event (GtkWidget *widget, - GdkEventKey *event) -{ - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreeIter iter; - gboolean active; - - - switch (event->keyval) - { - case GDK_Return: - case GDK_KP_Enter: - - if (!(model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)))) - return FALSE; - - if (!(selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(widget)))) - return FALSE; - - if (!(gtk_tree_selection_get_selected (selection, &model, &iter))) - return FALSE; - - /* Get boolean value */ - gtk_tree_model_get (model, - &iter, - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - &active, - -1); - /* Toggle item selected value on the TreeModel */ - gtk_list_store_set (GTK_LIST_STORE(model), - &iter, - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - !active, - -1); - return TRUE; - default: - return FALSE; - } - - return FALSE; -} Deleted: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.h 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-select-applets-dialog.h 2006-11-28 15:18:04 UTC (rev 8415) @@ -1,43 +0,0 @@ -/* - * This file is part of maemo-af-desktop - * - * Copyright (C) 2006 Nokia Corporation. - * - * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> - * Author: Johan Bilien <johan.bilien at nokia.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#ifndef __HILDON_HOME_SELECT_APPLETS_DIALOG_H__ -#define __HILDON_HOME_SELECT_APPLETS_DIALOG_H__ - -#include <libosso.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtktreemodel.h> -#include <glib/gi18n.h> - -#define HOME_APPLETS_SELECT_TITLE _("home_ti_select_applets") -#define HOME_APPLETS_SELECT_OK _("home_bd_select_applets_ok") -#define HOME_APPLETS_SELECT_CANCEL _("home_bd_select_applets_cancel") - - -GtkWidget * hildon_home_select_applets_dialog_new_with_model - (GtkTreeModel *model, - osso_context_t *osso_home); - - -#endif Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-home-window.c 2006-11-28 15:18:04 UTC (rev 8415) @@ -36,6 +36,7 @@ #include <stdio.h> #include <string.h> +#include <libosso.h> #include <glib.h> #include <libgnomevfs/gnome-vfs.h> @@ -53,9 +54,7 @@ #include "hildon-home-applet.h" #include "hildon-home-titlebar.h" #include "hildon-home-window.h" -#include "hildon-plugin-list.h" #include "hildon-home-background-dialog.h" -#include "hildon-home-select-applets-dialog.h" #define HILDON_HOME_LEFT_PADDING 80 /* keep synced with the TN width */ #define HILDON_HOME_WINDOW_WIDTH 800 @@ -92,7 +91,6 @@ struct _HildonHomeWindowPrivate { /* BackgroundManager *bg_manager;*/ - HildonPluginList *plugin_list; osso_context_t *osso_context; GtkWidget *align; @@ -295,20 +293,6 @@ } static void -plugin_list_directory_changed_cb (HildonPluginList *list, - HildonHomeWindow *window) -{ - HildonHomeWindowPrivate *priv = window->priv; - - hildon_home_area_sync_to_list (HILDON_HOME_AREA (priv->applet_area), - priv->plugin_list); - - hildon_home_area_sync_from_list ( - HILDON_HOME_AREA (priv->applet_area), - priv->plugin_list); -} - -static void area_layout_mode_ended (HildonHomeArea *area, HildonHomeWindow *window) { @@ -945,20 +929,7 @@ window->priv = priv = HILDON_HOME_WINDOW_GET_PRIVATE (window); priv->osso_context = NULL; - priv->plugin_list = g_object_new (HILDON_TYPE_PLUGIN_LIST, - "name-key", HH_APPLET_KEY_NAME, - "library-key", HH_APPLET_KEY_LIBRARY, - "group", HH_APPLET_GROUP, - "default-text-domain", "maemo-af-desktop", - NULL); - hildon_plugin_list_set_directory (priv->plugin_list, - HILDON_HOME_DESKTOP_ENTRY_DIR); - - g_signal_connect (G_OBJECT (priv->plugin_list), "directory-changed", - G_CALLBACK (plugin_list_directory_changed_cb), - window); - priv->is_dimmed = FALSE; } Deleted: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.c =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.c 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.c 2006-11-28 15:18:04 UTC (rev 8415) @@ -1,440 +0,0 @@ -/* - * This file is part of maemo-af-desktop - * - * Copyright (C) 2006 Nokia Corporation. - * - * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> - * Author: Johan Bilien <johan.bilien at nokia.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - -#include "hildon-plugin-list.h" -#include <hildon-base-lib/hildon-base-dnotify.h> -#include <string.h> -#include <libintl.h> - - -enum -{ - HILDON_PLUGIN_LIST_PROPERTY_DIRECTORY = 1, - HILDON_PLUGIN_LIST_PROPERTY_NAME_KEY, - HILDON_PLUGIN_LIST_PROPERTY_LIBRARY_KEY, - HILDON_PLUGIN_LIST_PROPERTY_TEXT_DOMAIN_KEY, - HILDON_PLUGIN_LIST_PROPERTY_GROUP, - HILDON_PLUGIN_LIST_PROPERTY_DEFAULT_TEXT_DOMAIN -}; - -typedef struct HildonPluginListPriv_ -{ - gchar *directory; - gchar *default_text_domain; - - gchar *group; - gchar *name_key; - gchar *library_key; - gchar *text_domain_key; -} HildonPluginListPriv; - - -#define HILDON_PLUGIN_LIST_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_TYPE_PLUGIN_LIST, HildonPluginListPriv)); - -static void -hildon_plugin_list_class_init (HildonPluginListClass *klass); - -static void -hildon_plugin_list_init (HildonPluginList *klass); - - -static void -hildon_plugin_list_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec); - -static void -hildon_plugin_list_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec); - -static void -hildon_plugin_list_populate (HildonPluginList *list); - -static void -hildon_plugin_list_directory_changed (HildonPluginList *list); - -GType hildon_plugin_list_get_type(void) -{ - static GType list_type = 0; - - if (!list_type) { - static const GTypeInfo list_info = { - sizeof(HildonPluginListClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) hildon_plugin_list_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof(HildonPluginList), - 0, /* n_preallocs */ - (GInstanceInitFunc) hildon_plugin_list_init, - }; - list_type = g_type_register_static(GTK_TYPE_LIST_STORE, - "HildonPluginList", - &list_info, 0); - } - return list_type; -} - - -static void -hildon_plugin_list_class_init (HildonPluginListClass *klass) -{ - GParamSpec *pspec; - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (HildonPluginListPriv)); - - object_class->set_property = hildon_plugin_list_set_property; - object_class->get_property = hildon_plugin_list_get_property; - - klass->directory_changed = hildon_plugin_list_directory_changed; - - g_signal_new ("directory-changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (HildonPluginListClass, - directory_changed), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - - pspec = g_param_spec_string ("directory", - "Directory holding the .desktop files", - "Directory holding the .desktop file", - "", - G_PARAM_READABLE | G_PARAM_WRITABLE); - - g_object_class_install_property (object_class, - HILDON_PLUGIN_LIST_PROPERTY_DIRECTORY, - pspec); - - pspec = g_param_spec_string ("name-key", - "Key for names", - "Key used in .desktop file to identify " - "the name", - "", - G_PARAM_READABLE | G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT); - - g_object_class_install_property (object_class, - HILDON_PLUGIN_LIST_PROPERTY_NAME_KEY, - pspec); - - pspec = g_param_spec_string ("library-key", - "Key for libraries", - "Key used in .desktop file to identify " - "the library file", - "", - G_PARAM_READABLE | G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT); - - g_object_class_install_property (object_class, - HILDON_PLUGIN_LIST_PROPERTY_LIBRARY_KEY, - pspec); - - pspec = g_param_spec_string ("text-domain-key", - "Key for text domains", - "Key used in .desktop file to identify " - "the text domain for translating the name", - "", - G_PARAM_READABLE | G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT); - - g_object_class_install_property (object_class, - HILDON_PLUGIN_LIST_PROPERTY_TEXT_DOMAIN_KEY, - pspec); - - pspec = g_param_spec_string ("group", - "Group", - "Group used in .desktop files", - "DesktopEntry", - G_PARAM_READABLE | G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT); - - g_object_class_install_property (object_class, - HILDON_PLUGIN_LIST_PROPERTY_GROUP, - pspec); - - pspec = g_param_spec_string ("default-text-domain", - "Default text domain", - "Default text domain used to translate " - "the name if no other provded", - "", - G_PARAM_READABLE | G_PARAM_WRITABLE); - - g_object_class_install_property - (object_class, - HILDON_PLUGIN_LIST_PROPERTY_DEFAULT_TEXT_DOMAIN, - pspec); - -} - -static void -hildon_plugin_list_init (HildonPluginList *list) -{ - HildonPluginListPriv *priv; - GType types [4] = { G_TYPE_STRING, /* desktop file */ - G_TYPE_STRING, /* library */ - G_TYPE_STRING, /* Translated name */ - G_TYPE_BOOLEAN }; /* Active */ - - priv = HILDON_PLUGIN_LIST_GET_PRIVATE (list); - - gtk_list_store_set_column_types (GTK_LIST_STORE (list), 4, types); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list), - HILDON_PLUGIN_LIST_COLUMN_NAME, - GTK_SORT_ASCENDING); - - priv->name_key = NULL; - priv->library_key = NULL; - priv->text_domain_key = NULL; - priv->group = NULL; - priv->default_text_domain = NULL; - priv->directory = NULL; -} - - -static void -hildon_plugin_list_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - HildonPluginListPriv *priv; - priv = HILDON_PLUGIN_LIST_GET_PRIVATE (HILDON_PLUGIN_LIST (object)); - - switch (property_id) - { - case HILDON_PLUGIN_LIST_PROPERTY_DIRECTORY: - hildon_plugin_list_set_directory (HILDON_PLUGIN_LIST (object), - g_value_get_string (value)); - break; - case HILDON_PLUGIN_LIST_PROPERTY_NAME_KEY: - g_object_notify (object, "name-key"); - g_free (priv->name_key); - priv->name_key = g_strdup (g_value_get_string (value)); - break; - case HILDON_PLUGIN_LIST_PROPERTY_LIBRARY_KEY: - g_object_notify (object, "library-key"); - g_free (priv->library_key); - priv->library_key = g_strdup (g_value_get_string (value)); - break; - case HILDON_PLUGIN_LIST_PROPERTY_TEXT_DOMAIN_KEY: - g_object_notify (object, "text-domain-key"); - g_free (priv->text_domain_key); - priv->text_domain_key = g_strdup (g_value_get_string (value)); - break; - case HILDON_PLUGIN_LIST_PROPERTY_GROUP: - g_object_notify (object, "group"); - g_free (priv->group); - priv->group = g_strdup (g_value_get_string (value)); - break; - case HILDON_PLUGIN_LIST_PROPERTY_DEFAULT_TEXT_DOMAIN: - g_object_notify (object, "default-text-domain"); - g_free (priv->default_text_domain); - priv->default_text_domain = g_strdup (g_value_get_string (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -hildon_plugin_list_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - HildonPluginListPriv *priv; - priv = HILDON_PLUGIN_LIST_GET_PRIVATE (HILDON_PLUGIN_LIST (object)); - - switch (property_id) - { - case HILDON_PLUGIN_LIST_PROPERTY_DIRECTORY: - g_value_set_string (value, priv->directory); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - -static void -hildon_plugin_list_directory_changed (HildonPluginList *list) -{ - HildonPluginListPriv *priv; - g_return_if_fail (list); - - priv = HILDON_PLUGIN_LIST_GET_PRIVATE (list); - - gtk_list_store_clear (GTK_LIST_STORE (list)); - hildon_plugin_list_populate (list); - -} - -static void -hildon_plugin_list_populate (HildonPluginList *list) -{ - HildonPluginListPriv *priv; - GKeyFile *keyfile = NULL; - GDir *dir = NULL; - GError *error = NULL; - const gchar *filename = NULL; - g_return_if_fail (list); - priv = HILDON_PLUGIN_LIST_GET_PRIVATE (list); - - if (!priv->directory) - return; - - dir = g_dir_open (priv->directory, 0, &error); - if (error) goto cleanup; - - keyfile = g_key_file_new (); - - while ((filename = g_dir_read_name (dir))) - { - gchar *name = NULL; - gchar *library = NULL; - gchar *provided_text_domain = NULL; - gchar *text_domain = NULL; - gchar *translated_name; - GtkTreeIter iter; - gchar *path = g_build_filename (priv->directory, filename, NULL); - - g_key_file_load_from_file (keyfile, - path, - G_KEY_FILE_NONE, - &error); - if (error) goto loop_cleanup; - - name = g_key_file_get_string (keyfile, - priv->group, - priv->name_key, - &error); - if (error) goto loop_cleanup; - - library = g_key_file_get_string (keyfile, - priv->group, - priv->library_key, - &error); - if (error) goto loop_cleanup; - - if (priv->text_domain_key && *priv->text_domain_key) - provided_text_domain = g_key_file_get_string (keyfile, - priv->group, - priv->text_domain_key, - &error); - - text_domain = - provided_text_domain? provided_text_domain: priv->default_text_domain; - - translated_name = (name && *name && text_domain)? - dgettext (text_domain, name): - name; - - gtk_list_store_append (GTK_LIST_STORE (list), &iter); - gtk_list_store_set (GTK_LIST_STORE (list), - &iter, - HILDON_PLUGIN_LIST_COLUMN_NAME, translated_name, - HILDON_PLUGIN_LIST_COLUMN_LIB, library, - HILDON_PLUGIN_LIST_COLUMN_DESKTOP_FILE, path, - -1); - -loop_cleanup: - if (error) - { - g_warning ("Could not parse %s: %s", path, error->message); - g_error_free (error); - error = NULL; - } - g_free (path); - g_free (name); - g_free (provided_text_domain); - g_free (library); - } - - -cleanup: - if (dir) - g_dir_close (dir); - if (error) - { - g_warning ("Error when opening plugin registry: %s", error->message); - g_error_free (error); - } - - if (keyfile) - g_key_file_free (keyfile); - -} - -static void -hildon_plugin_list_dnotify_callback (gchar *directory, - HildonPluginList *list) -{ - g_signal_emit_by_name (G_OBJECT(list), "directory-changed"); -} - - -/* Public functions */ - -void -hildon_plugin_list_set_directory (HildonPluginList *list, - const gchar *directory) -{ - HildonPluginListPriv *priv; - g_return_if_fail (list); - - priv = HILDON_PLUGIN_LIST_GET_PRIVATE (list); - - if ((directory && !priv->directory) || - (!directory && priv->directory) || - strcmp (directory, priv->directory)) - { - g_object_notify (G_OBJECT (list), "directory"); - - if (priv->directory) - hildon_dnotify_remove_cb (priv->directory); - - g_free (priv->directory); - priv->directory = g_strdup (directory); - hildon_dnotify_set_cb ((hildon_dnotify_cb_f *) - hildon_plugin_list_dnotify_callback, - priv->directory, - list); - - g_signal_emit_by_name (G_OBJECT (list), "directory-changed"); - } -} Deleted: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.h 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/hildon-plugin-list.h 2006-11-28 15:18:04 UTC (rev 8415) @@ -1,77 +0,0 @@ -/* - * This file is part of maemo-af-desktop - * - * Copyright (C) 2006 Nokia Corporation. - * - * Contact: Karoliina Salminen <karoliina.t.salminen at nokia.com> - * Author: Johan Bilien <johan.bilien at nokia.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * version 2.1 as published by the Free Software Foundation. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - * - */ - - -#ifndef HILDON_PLUGIN_LIST_H -#define HILDON_PLUGIN_LIST_H - -#include <glib.h> -#include <glib-object.h> -#include <gtk/gtkliststore.h> - -G_BEGIN_DECLS - -#define HILDON_TYPE_PLUGIN_LIST (hildon_plugin_list_get_type ()) -#define HILDON_PLUGIN_LIST(obj) (GTK_CHECK_CAST (obj, HILDON_TYPE_PLUGIN_LIST, HildonPluginList)) -#define HILDON_PLUGIN_LIST_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass),\ - HILDON_TYPE_PLUGIN_LIST, HildonPluginListClass)) -#define HILDON_IS_PLUGIN_LIST(obj) (GTK_CHECK_TYPE (obj, HILDON_TYPE_PLUGIN_LIST)) -#define HILDON_IS_PLUGIN_LIST_CLASS(klass) \ -(GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_PLUGIN_LIST)) - - -enum -{ - HILDON_PLUGIN_LIST_COLUMN_DESKTOP_FILE = 0, - HILDON_PLUGIN_LIST_COLUMN_NAME, - HILDON_PLUGIN_LIST_COLUMN_LIB, - HILDON_PLUGIN_LIST_COLUMN_ACTIVE, - HILDON_PLUGIN_LIST_N_COLUMNS -}; - -typedef struct _HildonPluginList HildonPluginList; -typedef struct _HildonPluginListClass HildonPluginListClass; - -struct _HildonPluginList { - GtkListStore parent; -}; - -struct _HildonPluginListClass { - GtkListStoreClass parent_class; - - void (* directory_changed) (HildonPluginList *list); - -}; - - -GType hildon_plugin_list_get_type (void); - - - -void hildon_plugin_list_set_directory (HildonPluginList *list, - const gchar *directory); - -G_END_DECLS -#endif /* HILDON_PLUGIN_LIST_H */ Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/libhildondesktop/libhildondesktop.h 2006-11-28 15:18:04 UTC (rev 8415) @@ -40,7 +40,6 @@ #include <libhildondesktop/hildon-thumb-menu-item.h> #include <libhildondesktop/hildon-home-applet.h> #include <libhildondesktop/hildon-home-area.h> -#include <libhildondesktop/hildon-plugin-list.h> #define HD_DEFINE_PLUGIN(TN, t_n, T_P) Modified: projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am =================================================================== --- projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am 2006-11-28 15:17:43 UTC (rev 8414) +++ projects/haf/branches/maemo-af-desktop/hildon-desktop/src/Makefile.am 2006-11-28 15:18:04 UTC (rev 8415) @@ -22,38 +22,42 @@ bin_PROGRAMS = hildon-desktop hildon_desktop_CPPFLAGS = \ - $(HILDON_CFLAGS) \ - $(OSSO_CFLAGS) \ - $(OSSO_HELP_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" \ - -I$(top_srcdir) \ - -DHD_DESKTOP_CONFIG_PATH=\"$(hildondesktopconfdir)\" \ - -DHD_PLUGIN_LOADER_LEGACY_HOME_MODULE_PATH=\"$(hildonhomelibdir)\" \ - -DHD_PLUGIN_LOADER_LEGACY_NAVIGATOR_MODULE_PATH=\"$(hildonnavigatorlibdir)\" + $(HILDON_CFLAGS) \ + $(OSSO_CFLAGS) \ + $(OSSO_HELP_CFLAGS) \ + -DLOCALEDIR=\"$(localedir)\" \ + -I$(top_srcdir) \ + -DHD_DESKTOP_CONFIG_PATH=\"$(hildondesktopconfdir)\" \ + -DHD_PLUGIN_LOADER_LEGACY_HOME_MODULE_PATH=\"$(hildonhomelibdir)\" \ + -DHD_PLUGIN_LOADER_LEGACY_NAVIGATOR_MODULE_PATH=\"$(hildonnavigatorlibdir)\" -hildon_desktop_LDFLAGS = $(HILDON_LIBS) \ - $(OSSO_LIBS) \ - $(OSSO_HELP_LIBS) +hildon_desktop_LDFLAGS = \ + $(HILDON_LIBS) \ + $(OSSO_LIBS) \ + $(OSSO_HELP_LIBS) -hildon_desktop_LDADD = $(top_srcdir)/libhildondesktop/libhildondesktop.la +hildon_desktop_LDADD = $(top_srcdir)/libhildondesktop/libhildondesktop.la -PLUGIN_MANAGER_SOURCES = hd-desktop.c \ - hd-desktop.h \ - hd-plugin-manager.c \ - hd-plugin-manager.h \ - hd-plugin-loader-factory.c \ - hd-plugin-loader-factory.h \ - hd-plugin-loader.c \ - hd-plugin-loader.h \ - hd-plugin-loader-legacy.c \ - hd-plugin-loader-legacy.h \ - hd-select-plugins-dialog.c \ - hd-select-plugins-dialog.h \ - hd-config.h +PLUGIN_MANAGER_SOURCES = \ + hd-desktop.c \ + hd-desktop.h \ + hd-plugin-manager.c \ + hd-plugin-manager.h \ + hd-plugin-loader-factory.c \ + hd-plugin-loader-factory.h \ + hd-plugin-loader.c \ + hd-plugin-loader.h \ + hd-plugin-loader-legacy.c \ + hd-plugin-loader-legacy.h \ + hd-select-plugins-dialog.c \ + hd-select-plugins-dialog.h \ + hd-config.h -HOME_SOURCES = hd-home-window.c \ - hd-home-window.h +HOME_SOURCES = \ + hd-home-window.c \ + hd-home-window.h -hildon_desktop_SOURCES = main.c \ - $(PLUGIN_MANAGER_SOURCES) \ - $(HOME_SOURCES) +hildon_desktop_SOURCES = \ + $(HOME_SOURCES) \ + $(PLUGIN_MANAGER_SOURCES) \ + main.c
- Previous message: [maemo-commits] r8414 - projects/haf/branches/maemo-af-desktop/hildon-desktop/src
- Next message: [maemo-commits] r8416 - projects/haf/tags/hildon-initscripts
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]