[maemo-commits] [maemo-commits] r11531 - in projects/haf/trunk/hildon-home-webshortcut: . debian plugin
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed May 9 10:43:43 EEST 2007
- Previous message: [maemo-commits] r11530 - projects/haf/trunk/hildon-theme-tools
- Next message: [maemo-commits] r11532 - in projects/haf/trunk/hildon-home-webshortcut: . debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi Date: 2007-05-09 10:43:42 +0300 (Wed, 09 May 2007) New Revision: 11531 Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog projects/haf/trunk/hildon-home-webshortcut/configure.ac projects/haf/trunk/hildon-home-webshortcut/debian/control projects/haf/trunk/hildon-home-webshortcut/plugin/Makefile.am projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c Log: 2007-05-09 Johan Bilien <johan.bilien at nokia.com> * plugin/hildon-home-webshortcut.c: Ported from osso-ic to libconic Fixes: NB#54077 Modified: projects/haf/trunk/hildon-home-webshortcut/ChangeLog =================================================================== --- projects/haf/trunk/hildon-home-webshortcut/ChangeLog 2007-05-09 07:37:11 UTC (rev 11530) +++ projects/haf/trunk/hildon-home-webshortcut/ChangeLog 2007-05-09 07:43:42 UTC (rev 11531) @@ -1,7 +1,14 @@ 2007-05-09 Johan Bilien <johan.bilien at nokia.com> + * plugin/hildon-home-webshortcut.c: Ported from osso-ic to + libconic + Fixes: NB#54077 + +2007-05-09 Johan Bilien <johan.bilien at nokia.com> + * plugin/hildon-home-webshortcut.c: Only launch the URI when the user didn't drag the mouse. + Fixes: NB#56353 2007-04-27 Johan Bilien <johan.bilien at nokia.com> Modified: projects/haf/trunk/hildon-home-webshortcut/configure.ac =================================================================== --- projects/haf/trunk/hildon-home-webshortcut/configure.ac 2007-05-09 07:37:11 UTC (rev 11530) +++ projects/haf/trunk/hildon-home-webshortcut/configure.ac 2007-05-09 07:43:42 UTC (rev 11531) @@ -52,9 +52,9 @@ PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= 2.8.3) AC_SUBST(GNOME_VFS_CFLAGS) -PKG_CHECK_MODULES(OSSO_IC, osso-ic) -AC_SUBST(OSSO_IC_LIBS) -AC_SUBST(OSSO_IC_CFLAGS) +PKG_CHECK_MODULES(CONIC, conic) +AC_SUBST(CONIC_LIBS) +AC_SUBST(CONIC_CFLAGS) PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.2) AC_SUBST(GCONF_LIBS) Modified: projects/haf/trunk/hildon-home-webshortcut/debian/control =================================================================== --- projects/haf/trunk/hildon-home-webshortcut/debian/control 2007-05-09 07:37:11 UTC (rev 11530) +++ projects/haf/trunk/hildon-home-webshortcut/debian/control 2007-05-09 07:43:42 UTC (rev 11531) @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Johan Bilien <johan.bilien at nokia.com> -Build-Depends: debhelper (>= 4.0.0), pkg-config, libhildon1-dev, libosso-dev (>= 0.9.18), osso-af-settings, osso-ic-dev, libhildonfm2-dev, libhildonmime-dev, libhildondesktop-dev (>= 0.0.0-30), hildon-desktop-dev +Build-Depends: debhelper (>= 4.0.0), pkg-config, libhildon1-dev, libosso-dev (>= 0.9.18), osso-af-settings, libconic0-dev, libhildonfm2-dev, libhildonmime-dev, libhildondesktop-dev (>= 0.0.0-30), hildon-desktop-dev Standards-Version: 3.6.0 Package: hildon-home-webshortcut Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/Makefile.am =================================================================== --- projects/haf/trunk/hildon-home-webshortcut/plugin/Makefile.am 2007-05-09 07:37:11 UTC (rev 11530) +++ projects/haf/trunk/hildon-home-webshortcut/plugin/Makefile.am 2007-05-09 07:43:42 UTC (rev 11531) @@ -23,29 +23,29 @@ libhildon_home_webshortcut_la_CPPFLAGS = $(HILDON_CFLAGS) \ - $(HILDONDESKTOP_CFLAGS) \ - $(GNOME_VFS_CFLAGS) \ - $(HILDON_FM_CFLAGS) \ - $(OSSO_IC_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(OSSOMIME_CFLAGS) \ - $(OSSO_CFLAGS) \ - $(BROWSER_CFLAGS) \ - -DLOCALEDIR=\"$(localedir)\" + $(HILDONDESKTOP_CFLAGS) \ + $(GNOME_VFS_CFLAGS) \ + $(HILDON_FM_CFLAGS) \ + $(CONIC_CFLAGS) \ + $(GCONF_CFLAGS) \ + $(OSSOMIME_CFLAGS) \ + $(OSSO_CFLAGS) \ + $(BROWSER_CFLAGS) \ + -DLOCALEDIR=\"$(localedir)\" libhildon_home_webshortcut_la_LDFLAGS = -module -avoid-version libhildon_home_webshortcut_la_LIBADD = $(HILDON_LIBS) \ - $(OSSO_LIBS) \ - $(HILDONDESKTOP_LIBS) \ - $(OSSO_IC_LIBS) \ - $(GCONF_LIBS) \ - $(HILDON_FM_LIBS) \ - $(OSSOMIME_LIBS) + $(OSSO_LIBS) \ + $(HILDONDESKTOP_LIBS) \ + $(CONIC_LIBS) \ + $(GCONF_LIBS) \ + $(HILDON_FM_LIBS) \ + $(OSSOMIME_LIBS) libhildon_home_webshortcut_la_SOURCES = hildon-home-webshortcut.c \ - hildon-home-webshortcut.h \ - hhwsloader.c \ - hhwsloader.h \ - hhws-l10n.h + hildon-home-webshortcut.h \ + hhwsloader.c \ + hhwsloader.h \ + hhws-l10n.h Modified: projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c =================================================================== --- projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c 2007-05-09 07:37:11 UTC (rev 11530) +++ projects/haf/trunk/hildon-home-webshortcut/plugin/hildon-home-webshortcut.c 2007-05-09 07:43:42 UTC (rev 11531) @@ -38,9 +38,9 @@ #include <gtk/gtkhbox.h> #include <gtk/gtkmenuitem.h> -#include <osso-ic.h> #include <libosso.h> #include <hildon-uri.h> +#include <conicconnection.h> #ifdef HAVE_CONFIG_H #include <config.h> @@ -380,7 +380,7 @@ g_free (priv->selected_image_uri); priv->selected_image_uri = NULL; - + gtk_widget_destroy (GTK_WIDGET (dialog)); } break; @@ -411,20 +411,18 @@ const gchar *default_image_name; const gchar *image_name; - dialog = gtk_dialog_new_with_buttons (HHWS_SET_TITLE, + dialog = gtk_dialog_new_with_buttons (HHWS_SET_TITLE, GTK_WINDOW (priv->home_win), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - HHWS_SET_OK, + HHWS_SET_OK, GTK_RESPONSE_OK, - HHWS_SET_BROWSE, + HHWS_SET_BROWSE, GTK_RESPONSE_APPLY, HHWS_SET_CANCEL, GTK_RESPONSE_CANCEL, NULL); - g_return_if_fail (dialog); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); group = GTK_SIZE_GROUP (gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL)); @@ -448,7 +446,7 @@ gtk_combo_box_set_active (GTK_COMBO_BOX(priv->image_cbox), 0); caption_image = hildon_caption_new (group, - HHWS_SET_IMAGE, + HHWS_SET_IMAGE, priv->image_cbox, NULL, HILDON_CAPTION_OPTIONAL); @@ -467,7 +465,7 @@ priv->uri); caption_url = hildon_caption_new (group, - HHWS_SET_URL, + HHWS_SET_URL, priv->entry_url, NULL, HILDON_CAPTION_OPTIONAL); @@ -531,10 +529,16 @@ if (priv->iap) { - if (osso_iap_connect (priv->iap, - OSSO_IAP_REQUESTED_CONNECT, - NULL) != OSSO_OK) - g_critical ("osso_iap_connect != OSSO_OK"); + ConIcConnection *connection; + + connection = con_ic_connection_new (); + + if (!con_ic_connection_connect_by_id (connection, + priv->iap, + CON_IC_CONNECT_FLAG_NONE)) + g_critical ("con_ic_connection_connect_by_id failed"); + + g_object_unref (connection); } hhws_launch_uri (hhws); @@ -606,27 +610,6 @@ } static void -hhws_launch_iap_cb (struct iap_event_t *event, - Hhws *hhws) -{ - HhwsPrivate *priv = hhws->priv; - - switch(event->type) - { - case OSSO_IAP_CONNECTED: - hhws_launch_uri (hhws); - break; - case OSSO_IAP_ERROR: - hildon_banner_show_information (priv->home_win, - NULL, - HHWS_IAP_SCAN_FAIL); - break; - default: - break; - } -} - -static void hhws_destroy (GtkObject *object) { Hhws *hhws = HHWS (object); @@ -702,23 +685,12 @@ priv->gconf_client = gconf_client_get_default (); hhws_load_configuration (hhws); - if (priv->iap != NULL) - { - gint iap_ok = osso_iap_cb ((osso_iap_cb_t)hhws_launch_iap_cb); - - if(iap_ok != OSSO_OK) - { - g_free (priv->iap); - priv->iap = NULL; - } - } - gtk_widget_set_size_request (GTK_WIDGET (hhws), HILDON_HOME_WS_WIDTH, HILDON_HOME_WS_HEIGHT); priv->image = gtk_image_new(); - + g_signal_connect_swapped (priv->image, "size-allocate", G_CALLBACK (hhws_image_size_allocate), hhws);
- Previous message: [maemo-commits] r11530 - projects/haf/trunk/hildon-theme-tools
- Next message: [maemo-commits] r11532 - in projects/haf/trunk/hildon-home-webshortcut: . debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]