diff options
29 files changed, 410 insertions, 259 deletions
@@ -1 +1 @@ -Cody Russell <crussell@canonical.com> +Mike Gabriel <mike.gabriel@das-netzwerkteam.de> diff --git a/AUTHORS.Canonical b/AUTHORS.Canonical new file mode 100644 index 0000000..01cb1cd --- /dev/null +++ b/AUTHORS.Canonical @@ -0,0 +1 @@ +Cody Russell <crussell@canonical.com> diff --git a/Makefile.am b/Makefile.am index 4b2a6d3..35d859f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,15 +8,15 @@ QUIET_GEN = $(Q:@=@echo ' GEN '$@;) SUBDIRS = src example tests -%-0.1.pc: %.pc +%-0.4.pc: %.pc $(QUIET_GEN) cp -f $< $@ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libido$(VER)-0.1.pc +pkgconfig_DATA = libayatana-ido$(VER)-0.4.pc -CLEANFILES = libido-0.1.pc libido3-0.1.pc -DISTCLEANFILES = libido.pc libido3.pc -EXTRA_DIST = libido.pc.in libido3.pc.in +CLEANFILES = libayatana-ido-0.4.pc libayatana-ido3-0.4.pc +DISTCLEANFILES = libayatana-ido.pc libayatana-ido3.pc +EXTRA_DIST = libayatana-ido.pc.in libayatana-ido3.pc.in DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc diff --git a/configure.ac b/configure.ac index ad525d7..07725d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ # # shamelessly stolen from clutter-gtk # -m4_define([ido_major_version], [13]) -m4_define([ido_minor_version], [10]) -m4_define([ido_micro_version], [1]) +m4_define([ido_major_version], [0]) +m4_define([ido_minor_version], [4]) +m4_define([ido_micro_version], [0]) m4_define([ido_api_version], [ido_major_version.ido_minor_version]) @@ -147,8 +147,8 @@ AC_CONFIG_FILES([ src/Makefile example/Makefile tests/Makefile - libido.pc - libido3.pc + libayatana-ido.pc + libayatana-ido3.pc ]) AC_OUTPUT diff --git a/debian/changelog b/debian/changelog index dd6fca1..7fb0ae9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ayatana-ido (0.4.0-0) UNRELEASED; urgency=medium + + * Fork from Ubuntu's ido code project. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 06 Nov 2015 12:32:00 +0100 + ido (13.10.0+15.10.20151002-0ubuntu1) wily; urgency=medium [ Lars Uebernickel ] diff --git a/debian/control b/debian/control index 6340947..72192a8 100644 --- a/debian/control +++ b/debian/control @@ -1,29 +1,26 @@ -Source: ido +Source: ayatana-ido Section: libs Priority: optional -Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Build-Depends: debhelper (>= 9), dh-autoreconf, gnome-common, - libxorg-gtest-dev, libxi-dev, libx11-dev, libgtest-dev, libglib2.0-dev (>=2.14.0), - libgtk-3-dev (>= 3.8.2-0ubuntu2), + libgtk-3-dev, gtk-doc-tools, gobject-introspection, libgirepository1.0-dev, valac (>= 0.16) -Standards-Version: 3.9.5 -Homepage: https://launchpad.net/ido -# If you aren't a member of ~indicator-applet-developers but need to upload -# packaging changes, just go ahead. ~indicator-applet-developers will notice -# and sync up the code again. -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/ido/trunk.13.04 -Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/ido/trunk.13.04/files +# libxorg-gtest-dev, +Standards-Version: 3.9.6 +Homepage: https://github.com/ArcticaProject/ayatana-ido +Vcs-Git: git://cgit.arctica-project.org/ayatana/ayatana-ido.git +Vcs-Browser: https://cgit.arctica-project.org/ayatana/ayatana-ido.git/ -Package: libido3-0.1-0 +Package: libayatana-ido3-0.4-0 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -35,13 +32,13 @@ Description: Shared library providing extra gtk menu items for display in . This package contains shared libraries to be used by GTK+ 3 applications. -Package: libido3-0.1-dev +Package: libayatana-ido3-0.4-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - gir1.2-ido3-0.1 (= ${binary:Version}), - libido3-0.1-0 (= ${binary:Version}), + gir1.2-ayatana-ido3-0.4 (= ${binary:Version}), + libayatana-ido3-0.4-0 (= ${binary:Version}), pkg-config, libglib2.0-dev (>=2.14.0), libgtk-3-dev (>= 3.8.2-0ubuntu2), @@ -50,14 +47,14 @@ Description: Shared library providing extra gtk menu items for display in . This package contains files that are needed to build GTK+ 3 applications. -Package: gir1.2-ido3-0.1 +Package: gir1.2-ayatana-ido3-0.4 Section: introspection Architecture: any Depends: ${misc:Depends}, - libido3-0.1-0 (>= ${binary:Version}), + libayatana-ido3-0.4-0 (>= ${binary:Version}), ${gir:Depends} -Description: Typelib file for libido3-0.1 +Description: Typelib file for libayatana-ido3-0.4 Shared library providing extra gtk menu items for display in system indicators. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libido3-0.1. + generate dynamic bindings for libayatana-ido3-0.4. diff --git a/debian/gir1.2-ido3-0.1.install b/debian/gir1.2-ayatana-ido3-0.4.install index cbe4832..cbe4832 100644 --- a/debian/gir1.2-ido3-0.1.install +++ b/debian/gir1.2-ayatana-ido3-0.4.install diff --git a/debian/libayatana-ido3-0.4-0.install b/debian/libayatana-ido3-0.4-0.install new file mode 100644 index 0000000..7400973 --- /dev/null +++ b/debian/libayatana-ido3-0.4-0.install @@ -0,0 +1 @@ +usr/lib/*/libayatana-ido3-*.so.* diff --git a/debian/libayatana-ido3-0.4-0.symbols b/debian/libayatana-ido3-0.4-0.symbols new file mode 100644 index 0000000..1802ceb --- /dev/null +++ b/debian/libayatana-ido3-0.4-0.symbols @@ -0,0 +1,118 @@ +libayatana-ido3-0.4.so.0 libayatana-ido3-0.4-0 #MINVER# + ayatana_menu_item_factory_create_menu_item@Base 0.4.0 + ayatana_menu_item_factory_get_all@Base 0.4.0 + ayatana_menu_item_factory_get_type@Base 0.4.0 + ido_action_helper_activate@Base 0.4.0 + ido_action_helper_activate_with_parameter@Base 0.4.0 + ido_action_helper_change_action_state@Base 0.4.0 + ido_action_helper_get_action_target@Base 0.4.0 + ido_action_helper_get_type@Base 0.4.0 + ido_action_helper_get_widget@Base 0.4.0 + ido_action_helper_new@Base 0.4.0 + ido_alarm_menu_item_new_from_model@Base 0.4.0 + ido_application_menu_item_get_type@Base 0.4.0 + ido_application_menu_item_new_from_model@Base 0.4.0 + ido_appointment_menu_item_new_from_model@Base 0.4.0 + ido_basic_menu_item_get_type@Base 0.4.0 + ido_basic_menu_item_new@Base 0.4.0 + ido_basic_menu_item_set_icon@Base 0.4.0 + ido_basic_menu_item_set_icon_from_file@Base 0.4.0 + ido_basic_menu_item_set_secondary_text@Base 0.4.0 + ido_basic_menu_item_set_text@Base 0.4.0 + ido_basic_menu_item_new_from_model@Base 0.4.0 + ido_calendar_menu_item_clear_marks@Base 0.2.1 + ido_calendar_menu_item_get_calendar@Base 0.1.10 + ido_calendar_menu_item_get_date@Base 0.2.1 + ido_calendar_menu_item_get_display_options@Base 0.2.1 + ido_calendar_menu_item_get_type@Base 0.1.10 + ido_calendar_menu_item_mark_day@Base 0.2.1 + ido_calendar_menu_item_new@Base 0.1.10 + ido_calendar_menu_item_new_from_model@Base 0.4.0 + ido_calendar_menu_item_set_date@Base 0.2.2 + ido_calendar_menu_item_set_display_options@Base 0.2.1 + ido_calendar_menu_item_unmark_day@Base 0.2.1 + ido_detail_label_get_text@Base 0.4.0 + ido_detail_label_get_type@Base 0.4.0 + ido_detail_label_new@Base 0.4.0 + ido_detail_label_set_count@Base 0.4.0 + ido_detail_label_set_text@Base 0.4.0 + ido_entry_menu_item_get_entry@Base 0.1.0 + ido_entry_menu_item_get_type@Base 0.1.0 + ido_entry_menu_item_new@Base 0.1.0 + ido_guest_menu_item_new_from_model@Base 0.4.0 + ido_init@Base 0.4.0 + ido_location_menu_item_get_type@Base 0.4.0 + ido_location_menu_item_new@Base 0.4.0 + ido_location_menu_item_new_from_model@Base 0.4.0 + ido_location_menu_item_set_timezone@Base 0.4.0 + ido_menu_item_factory_get_type@Base 0.4.0 + ido_message_dialog_get_type@Base 0.1.8 + ido_message_dialog_new@Base 0.1.8 + ido_message_dialog_new_with_markup@Base 0.1.8 + ido_progress_menu_item_new_from_model@Base 0.4.0 + ido_range_get_type@Base 0.1.9 + ido_range_new@Base 0.1.9 + ido_range_style_get_type@Base 0.1.9 + ido_scale_menu_item_get_primary_image@Base 0.1.1 + ido_scale_menu_item_get_primary_label@Base 0.1.9 + ido_scale_menu_item_get_scale@Base 0.1.0 + ido_scale_menu_item_get_secondary_image@Base 0.1.1 + ido_scale_menu_item_get_secondary_label@Base 0.1.9 + ido_scale_menu_item_get_style@Base 0.1.9 + ido_scale_menu_item_get_type@Base 0.1.0 + ido_scale_menu_item_new@Base 0.1.0 + ido_scale_menu_item_new_from_model@Base 0.4.0 + ido_scale_menu_item_new_with_range@Base 0.1.0 + ido_scale_menu_item_primary_clicked@Base 0.3.3 + ido_scale_menu_item_secondary_clicked@Base 0.3.3 + ido_scale_menu_item_set_primary_label@Base 0.1.9 + ido_scale_menu_item_set_secondary_label@Base 0.1.9 + ido_scale_menu_item_set_style@Base 0.1.9 + ido_scale_menu_item_style_get_type@Base 0.1.9 + ido_source_menu_item_get_type@Base 0.4.0 + ido_source_menu_item_new_from_menu_model@Base 0.4.0 + ido_switch_menu_item_get_content_area@Base 0.4.0 + ido_switch_menu_item_get_type@Base 0.4.0 + ido_switch_menu_item_new@Base 0.4.0 + ido_switch_menu_item_new_from_menu_model@Base 0.4.0 + ido_switch_menu_item_set_icon@Base 0.4.0 + ido_switch_menu_item_set_label@Base 0.4.0 + ido_timeline_calculate_progress@Base 0.1.8 + ido_timeline_direction_get_type@Base 0.1.8 + ido_timeline_get_direction@Base 0.1.8 + ido_timeline_get_duration@Base 0.1.8 + ido_timeline_get_fps@Base 0.1.8 + ido_timeline_get_loop@Base 0.1.8 + ido_timeline_get_progress@Base 0.1.8 + ido_timeline_get_screen@Base 0.1.8 + ido_timeline_get_type@Base 0.1.8 + ido_timeline_is_running@Base 0.1.8 + ido_timeline_new@Base 0.1.8 + ido_timeline_new_for_screen@Base 0.1.8 + ido_timeline_pause@Base 0.1.8 + ido_timeline_progress_type_get_type@Base 0.1.8 + ido_timeline_rewind@Base 0.1.8 + ido_timeline_set_direction@Base 0.1.8 + ido_timeline_set_duration@Base 0.1.8 + ido_timeline_set_fps@Base 0.1.8 + ido_timeline_set_loop@Base 0.1.8 + ido_timeline_set_progress@Base 0.1.10 + ido_timeline_set_screen@Base 0.1.8 + ido_timeline_start@Base 0.1.8 + ido_time_stamp_menu_item_get_type@Base 0.4.0 + ido_time_stamp_menu_item_new@Base 0.4.0 + ido_time_stamp_menu_item_set_format@Base 0.4.0 + ido_time_stamp_menu_item_get_format@Base 0.4.0 + ido_time_stamp_menu_item_set_date_time@Base 0.4.0 + ido_user_menu_item_get_type@Base 0.4.0 + ido_user_menu_item_new@Base 0.4.0 + ido_user_menu_item_new_from_model@Base 0.4.0 + ido_user_menu_item_set_current_user@Base 0.4.0 + ido_user_menu_item_set_icon@Base 0.4.0 + ido_user_menu_item_set_icon_from_file@Base 0.4.0 + ido_user_menu_item_set_label@Base 0.4.0 + ido_user_menu_item_set_logged_in@Base 0.4.0 + ido_media_player_menu_item_get_type@Base 0.4.0 + ido_media_player_menu_item_new_from_model@Base 0.4.0 + ido_playback_menu_item_get_type@Base 0.4.0 + ido_playback_menu_item_new_from_model@Base 0.4.0 diff --git a/debian/libayatana-ido3-0.4-dev.install b/debian/libayatana-ido3-0.4-dev.install new file mode 100644 index 0000000..a30594c --- /dev/null +++ b/debian/libayatana-ido3-0.4-dev.install @@ -0,0 +1,5 @@ +usr/include/libayatana-ido3-* +usr/lib/*/pkgconfig/libayatana-ido3-* +usr/lib/*/libayatana-ido3-*.so +usr/share/vala +usr/share/gir-1.0 diff --git a/debian/libido3-0.1-0.install b/debian/libido3-0.1-0.install deleted file mode 100644 index 6b5dd83..0000000 --- a/debian/libido3-0.1-0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libido3-*.so.* diff --git a/debian/libido3-0.1-0.symbols b/debian/libido3-0.1-0.symbols deleted file mode 100644 index 6c19de5..0000000 --- a/debian/libido3-0.1-0.symbols +++ /dev/null @@ -1,115 +0,0 @@ -libido3-0.1.so.0 libido3-0.1-0 #MINVER# - ido_action_helper_activate@Base 13.10.0daily13.06.19 - ido_action_helper_activate_with_parameter@Base 13.10.0+13.10.20130814 - ido_action_helper_change_action_state@Base 13.10.0daily13.06.19 - ido_action_helper_get_action_target@Base 13.10.0daily13.06.19 - ido_action_helper_get_type@Base 13.10.0daily13.06.19 - ido_action_helper_get_widget@Base 13.10.0daily13.06.19 - ido_action_helper_new@Base 13.10.0daily13.06.19 - ido_alarm_menu_item_new_from_model@Base 13.10.0+13.10.20130731 - ido_application_menu_item_get_type@Base 13.10.0+13.10.20130814 - ido_application_menu_item_new_from_model@Base 13.10.0+13.10.20130814 - ido_appointment_menu_item_new_from_model@Base 13.10.0daily13.06.19 - ido_basic_menu_item_get_type@Base 13.10.0+13.10.20130731 - ido_basic_menu_item_new@Base 13.10.0+13.10.20130731 - ido_basic_menu_item_set_icon@Base 13.10.0+13.10.20130731 - ido_basic_menu_item_set_icon_from_file@Base 13.10.0+13.10.20130731 - ido_basic_menu_item_set_secondary_text@Base 13.10.0+13.10.20130731 - ido_basic_menu_item_set_text@Base 13.10.0+13.10.20130731 - ido_basic_menu_item_new_from_model@Base 13.10.0+14.04.20140328 - ido_calendar_menu_item_clear_marks@Base 0.2.1 - ido_calendar_menu_item_get_calendar@Base 0.1.10 - ido_calendar_menu_item_get_date@Base 0.2.1 - ido_calendar_menu_item_get_display_options@Base 0.2.1 - ido_calendar_menu_item_get_type@Base 0.1.10 - ido_calendar_menu_item_mark_day@Base 0.2.1 - ido_calendar_menu_item_new@Base 0.1.10 - ido_calendar_menu_item_new_from_model@Base 13.10.0daily13.06.19 - ido_calendar_menu_item_set_date@Base 0.2.2 - ido_calendar_menu_item_set_display_options@Base 0.2.1 - ido_calendar_menu_item_unmark_day@Base 0.2.1 - ido_detail_label_get_text@Base 13.10.0+13.10.20130814 - ido_detail_label_get_type@Base 13.10.0+13.10.20130814 - ido_detail_label_new@Base 13.10.0+13.10.20130814 - ido_detail_label_set_count@Base 13.10.0+13.10.20130814 - ido_detail_label_set_text@Base 13.10.0+13.10.20130814 - ido_entry_menu_item_get_entry@Base 0.1.0 - ido_entry_menu_item_get_type@Base 0.1.0 - ido_entry_menu_item_new@Base 0.1.0 - ido_guest_menu_item_new_from_model@Base 13.10.0+13.10.20130628 - ido_init@Base 13.10.0daily13.06.19 - ido_location_menu_item_get_type@Base 13.10.0daily13.06.19 - ido_location_menu_item_new@Base 13.10.0daily13.06.19 - ido_location_menu_item_new_from_model@Base 13.10.0daily13.06.19 - ido_location_menu_item_set_timezone@Base 13.10.0daily13.06.19 - ido_menu_item_factory_get_type@Base 13.10.0daily13.06.19 - ido_message_dialog_get_type@Base 0.1.8 - ido_message_dialog_new@Base 0.1.8 - ido_message_dialog_new_with_markup@Base 0.1.8 - ido_progress_menu_item_new_from_model@Base 13.10.0+13.10.20130731 - ido_range_get_type@Base 0.1.9 - ido_range_new@Base 0.1.9 - ido_range_style_get_type@Base 0.1.9 - ido_scale_menu_item_get_primary_image@Base 0.1.1 - ido_scale_menu_item_get_primary_label@Base 0.1.9 - ido_scale_menu_item_get_scale@Base 0.1.0 - ido_scale_menu_item_get_secondary_image@Base 0.1.1 - ido_scale_menu_item_get_secondary_label@Base 0.1.9 - ido_scale_menu_item_get_style@Base 0.1.9 - ido_scale_menu_item_get_type@Base 0.1.0 - ido_scale_menu_item_new@Base 0.1.0 - ido_scale_menu_item_new_from_model@Base 13.10.0daily13.06.19 - ido_scale_menu_item_new_with_range@Base 0.1.0 - ido_scale_menu_item_primary_clicked@Base 0.3.3 - ido_scale_menu_item_secondary_clicked@Base 0.3.3 - ido_scale_menu_item_set_primary_label@Base 0.1.9 - ido_scale_menu_item_set_secondary_label@Base 0.1.9 - ido_scale_menu_item_set_style@Base 0.1.9 - ido_scale_menu_item_style_get_type@Base 0.1.9 - ido_source_menu_item_get_type@Base 13.10.0+13.10.20130814 - ido_source_menu_item_new_from_menu_model@Base 13.10.0+13.10.20130814 - ido_switch_menu_item_get_content_area@Base 12.10.0 - ido_switch_menu_item_get_type@Base 12.10.0 - ido_switch_menu_item_new@Base 12.10.0 - ido_switch_menu_item_new_from_menu_model@Base 13.10.0+14.04.20131105.1 - ido_switch_menu_item_set_icon@Base 13.10.0+14.04.20131105.1 - ido_switch_menu_item_set_label@Base 13.10.0+14.04.20131105.1 - ido_timeline_calculate_progress@Base 0.1.8 - ido_timeline_direction_get_type@Base 0.1.8 - ido_timeline_get_direction@Base 0.1.8 - ido_timeline_get_duration@Base 0.1.8 - ido_timeline_get_fps@Base 0.1.8 - ido_timeline_get_loop@Base 0.1.8 - ido_timeline_get_progress@Base 0.1.8 - ido_timeline_get_screen@Base 0.1.8 - ido_timeline_get_type@Base 0.1.8 - ido_timeline_is_running@Base 0.1.8 - ido_timeline_new@Base 0.1.8 - ido_timeline_new_for_screen@Base 0.1.8 - ido_timeline_pause@Base 0.1.8 - ido_timeline_progress_type_get_type@Base 0.1.8 - ido_timeline_rewind@Base 0.1.8 - ido_timeline_set_direction@Base 0.1.8 - ido_timeline_set_duration@Base 0.1.8 - ido_timeline_set_fps@Base 0.1.8 - ido_timeline_set_loop@Base 0.1.8 - ido_timeline_set_progress@Base 0.1.10 - ido_timeline_set_screen@Base 0.1.8 - ido_timeline_start@Base 0.1.8 - ido_time_stamp_menu_item_get_type@Base 13.10.0+13.10.20130731 - ido_time_stamp_menu_item_new@Base 13.10.0+13.10.20130731 - ido_time_stamp_menu_item_set_format@Base 13.10.0+13.10.20130731 - ido_time_stamp_menu_item_get_format@Base 13.10.0+13.10.20130731 - ido_time_stamp_menu_item_set_date_time@Base 13.10.0+13.10.20130731 - ido_user_menu_item_get_type@Base 13.10.0daily13.06.19 - ido_user_menu_item_new@Base 13.10.0daily13.06.19 - ido_user_menu_item_new_from_model@Base 13.10.0daily13.06.19 - ido_user_menu_item_set_current_user@Base 13.10.0daily13.06.19 - ido_user_menu_item_set_icon@Base 13.10.0daily13.06.19 - ido_user_menu_item_set_icon_from_file@Base 13.10.0+13.10.20130628 - ido_user_menu_item_set_label@Base 13.10.0daily13.06.19 - ido_user_menu_item_set_logged_in@Base 13.10.0daily13.06.19 - ido_media_player_menu_item_get_type@Base 13.10.0+13.10.20130628 - ido_media_player_menu_item_new_from_model@Base 13.10.0+13.10.20130628 - ido_playback_menu_item_get_type@Base 13.10.0+13.10.20130628 - ido_playback_menu_item_new_from_model@Base 13.10.0+13.10.20130628 diff --git a/debian/libido3-0.1-dev.install b/debian/libido3-0.1-dev.install deleted file mode 100644 index a3208de..0000000 --- a/debian/libido3-0.1-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/include/libido3-* -usr/lib/*/pkgconfig/libido3-* -usr/lib/*/libido3-*.so -usr/share/vala -usr/share/gir-1.0 diff --git a/debian/rules b/debian/rules index c05f4c4..6b571b0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,8 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 %: dh $@ --with autoreconf +override_dh_auto_test: + override_dh_autoreconf: NOCONFIGURE=1 dh_autoreconf ./autogen.sh diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..9f8e9b6 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0
\ No newline at end of file diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 1597c3c..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://launchpad.net/ido/+download .*/ido-([0-9.]+)\.tar\.gz diff --git a/example/Makefile.am b/example/Makefile.am index a578404..1cefafe 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -26,6 +26,6 @@ menus_CPPFLAGS = \ $(GTK_CFLAGS) \ $(MAINTAINER_CFLAGS) -messagedialog_LDADD = $(top_builddir)/src/libido$(VER)-0.1.la $(GTK_LIBS) +messagedialog_LDADD = $(top_builddir)/src/libayatana-ido$(VER)-0.4.la $(GTK_LIBS) -menus_LDADD = $(top_builddir)/src/libido$(VER)-0.1.la $(GTK_LIBS) +menus_LDADD = $(top_builddir)/src/libayatana-ido$(VER)-0.4.la $(GTK_LIBS) diff --git a/libido.pc.in b/libido.pc.in deleted file mode 100644 index 1e6a839..0000000 --- a/libido.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libido -Description: Ayatana Indicator Display Objects -Version: @VERSION@ -Libs: -L${libdir} -lido-0.1 -Cflags: -I${includedir}/libido-0.1 -Requires: gtk+-2.0 diff --git a/libido3.pc.in b/libido3.pc.in deleted file mode 100644 index db3ed1b..0000000 --- a/libido3.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libido -Description: Ayatana Indicator Display Objects -Version: @VERSION@ -Libs: -L${libdir} -lido3-0.1 -Cflags: -I${includedir}/libido3-0.1 -Requires: gtk+-3.0 diff --git a/src/Makefile.am b/src/Makefile.am index e18fb70..6b22590 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ CLEANFILES = VER=3 -lib_LTLIBRARIES = libido3-0.1.la +lib_LTLIBRARIES = libayatana-ido3-0.4.la ido_built_public_sources = \ idotypebuiltins.h @@ -11,6 +11,8 @@ stamp_files = \ idotypebuiltins.c sources_h = \ + ayatanamenuitemfactory.h \ + ayatana-private.h \ idoalarmmenuitem.h \ idocalendarmenuitem.h \ idoentrymenuitem.h \ @@ -25,7 +27,7 @@ sources_h = \ idotimestampmenuitem.h \ idolocationmenuitem.h \ idotimeline.h \ - libido.h \ + libayatana-ido.h \ idoactionhelper.h \ idomediaplayermenuitem.h \ idoplaybackmenuitem.h \ @@ -71,8 +73,9 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(COVERAGE_CFLAGS) -libido_0_1_la_SOURCES = \ - libido.c \ +libayatana_ido_0_4_la_SOURCES = \ + ayatanamenuitemfactory.c \ + libayatana-ido.c \ idotypebuiltins.c \ idocalendarmenuitem.c \ idoalarmmenuitem.c \ @@ -96,11 +99,11 @@ libido_0_1_la_SOURCES = \ idodetaillabel.c \ idosourcemenuitem.c -libido3_0_1_la_SOURCES = $(libido_0_1_la_SOURCES) +libayatana_ido3_0_4_la_SOURCES = $(libayatana_ido_0_4_la_SOURCES) -libidoincludedir=$(includedir)/libido$(VER)-0.1/libido +libayatana_idoincludedir=$(includedir)/libayatana-ido$(VER)-0.4/libayatana-ido -libidoinclude_HEADERS = \ +libayatana_idoinclude_HEADERS = \ idocalendarmenuitem.h \ idoentrymenuitem.h \ idomessagedialog.h \ @@ -108,17 +111,17 @@ libidoinclude_HEADERS = \ idoscalemenuitem.h \ idoswitchmenuitem.h \ idotimeline.h \ - libido.h + libayatana-ido.h -libido_0_1_la_LIBADD = $(GTK_LIBS) $(LIBM) -libido_0_1_la_LDFLAGS = \ +libayatana_ido_0_4_la_LIBADD = $(GTK_LIBS) $(LIBM) +libayatana_ido_0_4_la_LDFLAGS = \ $(GTK_LT_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ -no-undefined \ -export-symbols-regex "^[^_].*" -libido3_0_1_la_LIBADD = $(libido_0_1_la_LIBADD) -libido3_0_1_la_LDFLAGS = \ - $(libido_0_1_la_LDFLAGS) +libayatana_ido3_0_4_la_LIBADD = $(libayatana_ido_0_4_la_LIBADD) +libayatana_ido3_0_4_la_LDFLAGS = \ + $(libayatana_ido_0_4_la_LDFLAGS) DISTCLEANFILES = \ stamp-idotypebuiltins.h \ @@ -134,11 +137,11 @@ INTROSPECTION_SCANNER_ARGS = \ if HAVE_INTROSPECTION -Ido3-0.1.gir: libido3-0.1.la -Ido3_0_1_gir_INCLUDES = Gtk-3.0 -Ido3_0_1_gir_CFLAGS = -Ido3_0_1_gir_LIBS = libido3-0.1.la -Ido3_0_1_gir_FILES = \ +AyatanaIdo3-0.4.gir: libayatana-ido3-0.4.la +AyatanaIdo3_0_4_gir_INCLUDES = Gtk-3.0 +AyatanaIdo3_0_4_gir_CFLAGS = +AyatanaIdo3_0_4_gir_LIBS = libayatana-ido3-0.4.la +AyatanaIdo3_0_4_gir_FILES = \ idocalendarmenuitem.h \ idoentrymenuitem.h \ idomessagedialog.h \ @@ -146,12 +149,12 @@ Ido3_0_1_gir_FILES = \ idoscalemenuitem.h \ idoswitchmenuitem.h \ idotimeline.h \ - $(libido_0_1_la_SOURCES) -Ido3_0_1_gir_NAMESPACE = Ido3 -Ido3_0_1_gir_VERSION = 0.1 -Ido3_0_1_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) + $(libayatana_ido_0_4_la_SOURCES) +AyatanaIdo3_0_4_gir_NAMESPACE = AyatanaIdo3 +AyatanaIdo3_0_4_gir_VERSION = 0.4 +AyatanaIdo3_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) -INTROSPECTION_GIRS += Ido3-0.1.gir +INTROSPECTION_GIRS += AyatanaIdo3-0.4.gir girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) @@ -166,10 +169,10 @@ endif if HAVE_INTROSPECTION vapidir = $(datadir)/vala/vapi -vapi_DATA = Ido3-0.1.vapi +vapi_DATA = AyatanaIdo3-0.4.vapi -Ido3-0.1.vapi: Ido3-0.1.gir - $(VALA_API_GEN) --library=Ido3-0.1 \ +AyatanaIdo3-0.4.vapi: AyatanaIdo3-0.4.gir + $(VALA_API_GEN) --library=AyatanaIdo3-0.4 \ --pkg gtk+-3.0 \ $< diff --git a/src/ayatana-private.h b/src/ayatana-private.h new file mode 100644 index 0000000..3cb7e65 --- /dev/null +++ b/src/ayatana-private.h @@ -0,0 +1,32 @@ +/* +* Copyright 2013 Canonical Ltd. +* +* This program is free software: you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 3, as published +* by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranties of +* MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +* PURPOSE. See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see <http://www.gnu.org/licenses/>. +* +* Authors: +* Lars Uebernickel <lars.uebernickel@canonical.com> +*/ + +/* + * Warning: this file is not part of gtk+, but an Ubuntu-specific extension. + * The API provided here is meant to be used only from Unity. + * + * Applications should not use this. + */ + +#ifndef __AYATANA_PRIVATE_H__ +#define __AYATANA_PRIVATE_H__ + +#include "ayatanamenuitemfactory.h" + +#endif diff --git a/src/ayatanamenuitemfactory.c b/src/ayatanamenuitemfactory.c new file mode 100644 index 0000000..0e333ab --- /dev/null +++ b/src/ayatanamenuitemfactory.c @@ -0,0 +1,69 @@ +/* +* Copyright 2013 Canonical Ltd. +* +* This program is free software: you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 3, as published +* by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranties of +* MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +* PURPOSE. See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see <http://www.gnu.org/licenses/>. +* +* Authors: +* Lars Uebernickel <lars.uebernickel@canonical.com> +*/ + +#include "ayatanamenuitemfactory.h" + +G_DEFINE_INTERFACE_WITH_CODE (AyatanaMenuItemFactory, ayatana_menu_item_factory, G_TYPE_OBJECT, + GIOExtensionPoint *ep = g_io_extension_point_register (AYATANA_MENU_ITEM_FACTORY_EXTENSION_POINT_NAME); + g_io_extension_point_set_required_type (ep, g_define_type_id);) + +/* + * ayatana_menu_item_factory_get_all: + * + * Returns a static list of all registered factories. + */ +GList * +ayatana_menu_item_factory_get_all (void) +{ + static GList *factories = NULL; + + if (factories == NULL) + { + GIOExtensionPoint *ep; + GList *it; + + g_type_ensure (AYATANA_TYPE_MENU_ITEM_FACTORY); + ep = g_io_extension_point_lookup (AYATANA_MENU_ITEM_FACTORY_EXTENSION_POINT_NAME); + for (it = g_io_extension_point_get_extensions (ep); it != NULL; it = it->next) + { + GIOExtension *ext = it->data; + AyatanaMenuItemFactory *factory; + + factory = g_object_new (g_io_extension_get_type (ext), NULL); + factories = g_list_prepend (factories, factory); + } + factories = g_list_reverse (factories); + } + + return factories; +} + +static void +ayatana_menu_item_factory_default_init (AyatanaMenuItemFactoryInterface *iface) +{ +} + +GtkMenuItem * +ayatana_menu_item_factory_create_menu_item (AyatanaMenuItemFactory *factory, + const gchar *type, + GMenuItem *menuitem, + GActionGroup *actions) +{ + return AYATANA_MENU_ITEM_FACTORY_GET_IFACE (factory)->create_menu_item (factory, type, menuitem, actions); +} diff --git a/src/ayatanamenuitemfactory.h b/src/ayatanamenuitemfactory.h new file mode 100644 index 0000000..4013cce --- /dev/null +++ b/src/ayatanamenuitemfactory.h @@ -0,0 +1,61 @@ +/* +* Copyright 2013 Canonical Ltd. +* +* This program is free software: you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 3, as published +* by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranties of +* MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +* PURPOSE. See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see <http://www.gnu.org/licenses/>. +* +* Authors: +* Lars Uebernickel <lars.uebernickel@canonical.com> +*/ + +#ifndef __AYATANA_MENU_ITEM_FACTORY_H__ +#define __AYATANA_MENU_ITEM_FACTORY_H__ + +#include <gtk/gtk.h> + +G_BEGIN_DECLS + +#define AYATANA_TYPE_MENU_ITEM_FACTORY (ayatana_menu_item_factory_get_type ()) +#define AYATANA_MENU_ITEM_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), AYATANA_TYPE_MENU_ITEM_FACTORY, AyatanaMenuItemFactory)) +#define AYATANA_IS_MENU_ITEM_FACTORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), AYATANA_TYPE_MENU_ITEM_FACTORY)) +#define AYATANA_MENU_ITEM_FACTORY_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), AYATANA_TYPE_MENU_ITEM_FACTORY, AyatanaMenuItemFactoryInterface)) + +#define AYATANA_MENU_ITEM_FACTORY_EXTENSION_POINT_NAME "ubuntu-menu-item-factory" + +typedef struct _AyatanaMenuItemFactoryInterface AyatanaMenuItemFactoryInterface; +typedef struct _AyatanaMenuItemFactory AyatanaMenuItemFactory; + +struct _AyatanaMenuItemFactoryInterface +{ + GTypeInterface iface; + + GtkMenuItem * (*create_menu_item) (AyatanaMenuItemFactory *factory, + const gchar *type, + GMenuItem *menuitem, + GActionGroup *actions); +}; + +GDK_AVAILABLE_IN_3_10 +GList * ayatana_menu_item_factory_get_all (void); + +GDK_AVAILABLE_IN_3_10 +GType ayatana_menu_item_factory_get_type (void); + +GDK_AVAILABLE_IN_3_10 +GtkMenuItem * ayatana_menu_item_factory_create_menu_item (AyatanaMenuItemFactory *factory, + const gchar *type, + GMenuItem *menuitem, + GActionGroup *actions); + +G_END_DECLS + +#endif diff --git a/src/idoalarmmenuitem.c b/src/idoalarmmenuitem.c index 1c53836..817d6a8 100644 --- a/src/idoalarmmenuitem.c +++ b/src/idoalarmmenuitem.c @@ -33,7 +33,7 @@ * @actions: action group to tell when this GtkMenuItem is activated * * Creates a new IdoTimeStampMenuItem with properties initialized - * appropriately for a com.canonical.indicator.alarm + * appropriately for a org.ayatana.indicator.alarm * * If the menuitem's 'action' attribute is set, trigger that action * in @actions when this IdoAppointmentMenuItem is activated. diff --git a/src/idoappointmentmenuitem.c b/src/idoappointmentmenuitem.c index cfc0bf8..0d6a3d2 100644 --- a/src/idoappointmentmenuitem.c +++ b/src/idoappointmentmenuitem.c @@ -75,7 +75,7 @@ create_color_icon_pixbuf (const char * color_spec) * @actions: action group to tell when this GtkMenuItem is activated * * Creates a new IdoTimeStampMenuItem with properties initialized - * appropriately for a com.canonical.indicator.alarm + * appropriately for a org.ayatana.indicator.alarm * * If the menuitem's 'action' attribute is set, trigger that action * in @actions when this IdoAppointmentMenuItem is activated. diff --git a/src/idomenuitemfactory.c b/src/idomenuitemfactory.c index cb10cce..8d2334b 100644 --- a/src/idomenuitemfactory.c +++ b/src/idomenuitemfactory.c @@ -18,7 +18,7 @@ */ #include <gtk/gtk.h> -#include <gtk/ubuntu-private.h> +#include "ayatana-private.h" #include "idoalarmmenuitem.h" #include "idoappointmentmenuitem.h" @@ -42,15 +42,15 @@ typedef GObject IdoMenuItemFactory; typedef GObjectClass IdoMenuItemFactoryClass; GType ido_menu_item_factory_get_type (void); -static void ido_menu_item_factory_interface_init (UbuntuMenuItemFactoryInterface *iface); +static void ido_menu_item_factory_interface_init (AyatanaMenuItemFactoryInterface *iface); G_DEFINE_TYPE_WITH_CODE (IdoMenuItemFactory, ido_menu_item_factory, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (UBUNTU_TYPE_MENU_ITEM_FACTORY, ido_menu_item_factory_interface_init) - g_io_extension_point_implement (UBUNTU_MENU_ITEM_FACTORY_EXTENSION_POINT_NAME, + G_IMPLEMENT_INTERFACE (AYATANA_TYPE_MENU_ITEM_FACTORY, ido_menu_item_factory_interface_init) + g_io_extension_point_implement (AYATANA_MENU_ITEM_FACTORY_EXTENSION_POINT_NAME, g_define_type_id, "ido", 0);) static GtkMenuItem * -ido_menu_item_factory_create_menu_item (UbuntuMenuItemFactory *factory, +ido_menu_item_factory_create_menu_item (AyatanaMenuItemFactory *factory, const gchar *type, GMenuItem *menuitem, GActionGroup *actions) @@ -63,40 +63,40 @@ ido_menu_item_factory_create_menu_item (UbuntuMenuItemFactory *factory, if (g_str_equal (type, "indicator.guest-menu-item")) item = ido_guest_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.calendar")) + else if (g_str_equal (type, "org.ayatana.indicator.calendar")) item = ido_calendar_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.location")) + else if (g_str_equal (type, "org.ayatana.indicator.location")) item = ido_location_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.appointment")) + else if (g_str_equal (type, "org.ayatana.indicator.appointment")) item = ido_appointment_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.alarm")) + else if (g_str_equal (type, "org.ayatana.indicator.alarm")) item = ido_alarm_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.basic")) + else if (g_str_equal (type, "org.ayatana.indicator.basic")) item = ido_basic_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.progress")) + else if (g_str_equal (type, "org.ayatana.indicator.progress")) item = ido_progress_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.unity.slider")) + else if (g_str_equal (type, "org.ayatana.unity.slider")) item = ido_scale_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.unity.media-player")) + else if (g_str_equal (type, "org.ayatana.unity.media-player")) item = ido_media_player_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.unity.playback-item")) + else if (g_str_equal (type, "org.ayatana.unity.playback-item")) item = ido_playback_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.application")) + else if (g_str_equal (type, "org.ayatana.application")) item = ido_application_menu_item_new_from_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.messages.source")) + else if (g_str_equal (type, "org.ayatana.indicator.messages.source")) item = ido_source_menu_item_new_from_menu_model (menuitem, actions); - else if (g_str_equal (type, "com.canonical.indicator.switch")) + else if (g_str_equal (type, "org.ayatana.indicator.switch")) item = ido_switch_menu_item_new_from_menu_model (menuitem, actions); return item; @@ -108,7 +108,7 @@ ido_menu_item_factory_class_init (IdoMenuItemFactoryClass *class) } static void -ido_menu_item_factory_interface_init (UbuntuMenuItemFactoryInterface *iface) +ido_menu_item_factory_interface_init (AyatanaMenuItemFactoryInterface *iface) { iface->create_menu_item = ido_menu_item_factory_create_menu_item; } diff --git a/src/libido.c b/src/libayatana-ido.c index 0c90213..0c90213 100644 --- a/src/libido.c +++ b/src/libayatana-ido.c diff --git a/src/libayatana-ido.h b/src/libayatana-ido.h new file mode 100644 index 0000000..43a8168 --- /dev/null +++ b/src/libayatana-ido.h @@ -0,0 +1,36 @@ +/* + * Copyright 2010 Canonical, Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of either or both of the following licenses: + * + * 1) the GNU Lesser General Public License version 3, as published by the + * Free Software Foundation; and/or + * 2) the GNU Lesser General Public License version 2.1, as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the applicable version of the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of both the GNU Lesser General Public + * License version 3 and version 2.1 along with this program. If not, see + * <http://www.gnu.org/licenses/> + * + * Authors: + * Cody Russell <crussell@canonical.com> + */ + +#ifndef __IDO__ +#define __IDO__ + +#include <libido/idocalendarmenuitem.h> +#include <libido/idoscalemenuitem.h> +#include <libido/idoentrymenuitem.h> +#include <libido/idomessagedialog.h> + +void ido_init (void); + +#endif /* __IDO__ */ diff --git a/src/libido.h b/src/libido.h index 43a8168..e69de29 100644 --- a/src/libido.h +++ b/src/libido.h @@ -1,36 +0,0 @@ -/* - * Copyright 2010 Canonical, Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of either or both of the following licenses: - * - * 1) the GNU Lesser General Public License version 3, as published by the - * Free Software Foundation; and/or - * 2) the GNU Lesser General Public License version 2.1, as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the applicable version of the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of both the GNU Lesser General Public - * License version 3 and version 2.1 along with this program. If not, see - * <http://www.gnu.org/licenses/> - * - * Authors: - * Cody Russell <crussell@canonical.com> - */ - -#ifndef __IDO__ -#define __IDO__ - -#include <libido/idocalendarmenuitem.h> -#include <libido/idoscalemenuitem.h> -#include <libido/idoentrymenuitem.h> -#include <libido/idomessagedialog.h> - -void ido_init (void); - -#endif /* __IDO__ */ |