[Ayatana-commits] [Merge] lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime
Karl Lattimer has proposed merging lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime. Requested reviews: David Barth (dbarth) Related bugs: Bug #740806 in indicator-datetime (Ubuntu): Add Appointment should be Add Event… https://bugs.launchpad.net/ubuntu/+source/indicator-datetime/+bug/740806 Bug #740819 in indicator-datetime (Ubuntu): Date item isn't sensitive when Evolution is installed https://bugs.launchpad.net/ubuntu/+source/indicator-datetime/+bug/740819 For more details, see: https://code.launchpad.net/~karl-qdh/indicator-datetime/sniffles/+merge/54501 Two UX bugs from MPT 'sniffles' -- https://code.launchpad.net/~karl-qdh/indicator-datetime/sniffles/+merge/54501 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. === modified file 'src/datetime-service.c' --- src/datetime-service.c 2011-03-22 21:38:50 + +++ src/datetime-service.c 2011-03-23 12:06:08 + @@ -371,11 +371,15 @@ dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); dbusmenu_menuitem_property_set_bool(calendar, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE); + dbusmenu_menuitem_property_set_bool(date, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); + g_signal_connect (G_OBJECT(date), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, + G_CALLBACK (activate_cb), evolution -c calendar); + events_separator = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set(events_separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); dbusmenu_menuitem_child_add_position(root, events_separator, 2); add_appointment = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _(Add Appointment)); + dbusmenu_menuitem_property_set (add_appointment, DBUSMENU_MENUITEM_PROP_LABEL, _(Add Event...)); dbusmenu_menuitem_property_set_bool(add_appointment, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE); g_signal_connect(G_OBJECT(add_appointment), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), evolution -c calendar); dbusmenu_menuitem_child_add_position (root, add_appointment, 3); ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
Re: [Ayatana-commits] [Merge] lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime
Review: Needs Fixing You need to check that evolution is installed before you enable the items. It's ok not to update that when it's installed after the indicator has started or if it gets uninstalled though. There is an example for that at: http://bazaar.launchpad.net/~indicator-applet-developers/indicator-me/trunk/view/head:/src/me-service.c#L251 -- https://code.launchpad.net/~karl-qdh/indicator-datetime/sniffles/+merge/54501 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
Re: [Ayatana-commits] [Merge] lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime
this is already done a few lines above the diff;
368: datetime-service.c
gchar *evo = g_find_program_in_path(evolution);
if (evo != NULL) {
g_debug(Found the calendar application: %s, evo);
--
https://code.launchpad.net/~karl-qdh/indicator-datetime/sniffles/+merge/54501
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~mterry/indicator-datetime/free-json-memory into lp:indicator-datetime
Michael Terry has proposed merging lp:~mterry/indicator-datetime/free-json-memory into lp:indicator-datetime. Requested reviews: Indicator Applet Developers (indicator-applet-developers) For more details, see: https://code.launchpad.net/~mterry/indicator-datetime/free-json-memory/+merge/54516 -- https://code.launchpad.net/~mterry/indicator-datetime/free-json-memory/+merge/54516 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime
The proposal to merge lp:~karl-qdh/indicator-datetime/sniffles into lp:indicator-datetime has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~karl-qdh/indicator-datetime/sniffles/+merge/54501 -- https://code.launchpad.net/~karl-qdh/indicator-datetime/sniffles/+merge/54501 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~mterry/indicator-datetime/filter-when-no-internet into lp:indicator-datetime
The proposal to merge lp:~mterry/indicator-datetime/filter-when-no-internet into lp:indicator-datetime has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~mterry/indicator-datetime/filter-when-no-internet/+merge/54521 -- https://code.launchpad.net/~mterry/indicator-datetime/filter-when-no-internet/+merge/54521 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~mterry/indicator-datetime/free-json-memory into lp:indicator-datetime
The proposal to merge lp:~mterry/indicator-datetime/free-json-memory into lp:indicator-datetime has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~mterry/indicator-datetime/free-json-memory/+merge/54516 -- https://code.launchpad.net/~mterry/indicator-datetime/free-json-memory/+merge/54516 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~mterry/indicator-datetime/avoid-duplicate-geonames into lp:indicator-datetime
The proposal to merge lp:~mterry/indicator-datetime/avoid-duplicate-geonames into lp:indicator-datetime has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~mterry/indicator-datetime/avoid-duplicate-geonames/+merge/54515 -- https://code.launchpad.net/~mterry/indicator-datetime/avoid-duplicate-geonames/+merge/54515 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~ted/indicator-applet/set-environment into lp:indicator-applet
The proposal to merge lp:~ted/indicator-applet/set-environment into lp:indicator-applet has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~ted/indicator-applet/set-environment/+merge/54425 -- https://code.launchpad.net/~ted/indicator-applet/set-environment/+merge/54425 Your team ayatana-commits is subscribed to branch lp:indicator-applet. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-applet/applet] Rev 383: Set the environment for the applet
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-applet/set-environment/+merge/54425
proposed by: Ted Gould (ted)
review: Approve - Conor Curran (cjcurran)
revno: 383 [merge]
committer: Ted Gould t...@gould.cx
branch nick: trunk
timestamp: Wed 2011-03-23 10:46:10 -0500
message:
Set the environment for the applet
modified:
src/applet-main.c
--
lp:indicator-applet
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet
Your team ayatana-commits is subscribed to branch lp:indicator-applet.
To unsubscribe from this branch go to
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet/+edit-subscription
=== modified file 'src/applet-main.c'
--- src/applet-main.c 2011-02-17 20:51:09 +
+++ src/applet-main.c 2011-03-22 20:35:19 +
@@ -119,6 +119,28 @@
gchar * hotkey_keycode = SuperF1;
#endif
+/
+ * Environment Names
+ * ***/
+#ifdef INDICATOR_APPLET
+#define INDICATOR_SPECIFIC_ENV indicator-applet-original
+#endif
+#ifdef INDICATOR_APPLET_SESSION
+#define INDICATOR_SPECIFIC_ENV indicator-applet-session
+#endif
+#ifdef INDICATOR_APPLET_COMPLETE
+#define INDICATOR_SPECIFIC_ENV indicator-applet-complete
+#endif
+#ifdef INDICATOR_APPLET_APPMENU
+#define INDICATOR_SPECIFIC_ENV indicator-applet-appmenu
+#endif
+
+static const gchar * indicator_env[] = {
+ indicator-applet,
+ INDICATOR_SPECIFIC_ENV,
+ NULL
+};
+
/*
* init function
* ***/
@@ -496,6 +518,9 @@
IndicatorObject * io = indicator_object_new_from_file(fullpath);
g_free(fullpath);
+ /* Set the environment it's in */
+ indicator_object_set_environment(io, (const GStrv)indicator_env);
+
/* Attach the 'name' to the object */
g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER, GINT_TO_POINTER(name2order(name)));
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~mterry/indicator-datetime/robustify-location-popup into lp:indicator-datetime
Michael Terry has proposed merging
lp:~mterry/indicator-datetime/robustify-location-popup into
lp:indicator-datetime.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
For more details, see:
https://code.launchpad.net/~mterry/indicator-datetime/robustify-location-popup/+merge/54552
Just a few cleanups to make sure that the location popup always appears.
--
https://code.launchpad.net/~mterry/indicator-datetime/robustify-location-popup/+merge/54552
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
=== modified file 'src/timezone-completion.c'
--- src/timezone-completion.c 2011-03-23 15:33:31 +
+++ src/timezone-completion.c 2011-03-23 15:56:32 +
@@ -80,6 +80,11 @@
gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), model);
gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion));
+
+ /* By this time, the changed signal has come and gone. We didn't give a
+ model to use, so no popup appeared for user. Poke the entry again to show
+ popup in 300ms. */
+ g_signal_emit_by_name (priv-entry, changed);
}
static void
@@ -115,8 +120,14 @@
JsonReader * reader = json_reader_new (json_parser_get_root (JSON_PARSER (object)));
+ TREE
if (!json_reader_is_array (reader)) {
g_object_unref (G_OBJECT (reader));
+===
+ if (!json_reader_is_array (reader)) {
+g_warning (Could not parse geoname JSON data);
+save_and_use_model (completion, priv-initial_model);
+ MERGE-SOURCE
return;
}
@@ -223,15 +234,6 @@
return FALSE;
}
- const gchar * text = gtk_entry_get_text (priv-entry);
-
- gpointer data;
- if (g_hash_table_lookup_extended (priv-request_table, text, NULL, data)) {
-gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), GTK_TREE_MODEL (data));
-gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion));
-return FALSE;
- }
-
/* Cancel any ongoing request */
if (priv-cancel) {
g_cancellable_cancel (priv-cancel);
@@ -239,6 +241,7 @@
}
g_free (priv-request_text);
+ const gchar * text = gtk_entry_get_text (priv-entry);
priv-request_text = g_strdup (text);
gchar * escaped = g_uri_escape_string (text, NULL, FALSE);
@@ -259,7 +262,18 @@
if (priv-queued_request) {
g_source_remove (priv-queued_request);
}
- priv-queued_request = g_timeout_add (300, (GSourceFunc)request_zones, completion);
+
+ /* See if we've already got this one */
+ const gchar * text = gtk_entry_get_text (priv-entry);
+ gpointer data;
+ if (g_hash_table_lookup_extended (priv-request_table, text, NULL, data)) {
+gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), GTK_TREE_MODEL (data));
+ }
+ else {
+priv-queued_request = g_timeout_add (300, (GSourceFunc)request_zones, completion);
+gtk_entry_completion_set_model (GTK_ENTRY_COMPLETION (completion), NULL);
+ }
+ gtk_entry_completion_complete (GTK_ENTRY_COMPLETION (completion));
}
void
@@ -267,6 +281,10 @@
{
TimezoneCompletionPrivate * priv = TIMEZONE_COMPLETION_GET_PRIVATE (completion);
+ if (priv-queued_request) {
+g_source_remove (priv-queued_request);
+priv-queued_request = 0;
+ }
if (priv-entry) {
g_source_remove (priv-changed_id);
g_object_remove_weak_pointer (G_OBJECT (priv-entry), (gpointer *)priv-entry);
___
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~jbicha/lo-menubar/description-lp-733615 into lp:lo-menubar
The proposal to merge lp:~jbicha/lo-menubar/description-lp-733615 into lp:lo-menubar has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~jbicha/lo-menubar/description-lp-733615/+merge/53109 -- https://code.launchpad.net/~jbicha/lo-menubar/description-lp-733615/+merge/53109 Your team ayatana-commits is subscribed to branch lp:lo-menubar. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~mterry/indicator-datetime/robustify-location-popup into lp:indicator-datetime
The proposal to merge lp:~mterry/indicator-datetime/robustify-location-popup into lp:indicator-datetime has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~mterry/indicator-datetime/robustify-location-popup/+merge/54552 -- https://code.launchpad.net/~mterry/indicator-datetime/robustify-location-popup/+merge/54552 Your team ayatana-commits is subscribed to branch lp:indicator-datetime. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
Re: [Ayatana-commits] [Merge] lp:~cando/indicator-me/emesene2_support into lp:indicator-me
Review: Approve Looks great, thanks for the contribution! If the freeze exception gets approved, i'll merge this to trunk. If not, I'll merge it after we create a maintenance branch. -- https://code.launchpad.net/~cando/indicator-me/emesene2_support/+merge/50178 Your team ayatana-commits is subscribed to branch lp:indicator-me. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-applet/applet] Rev 384: Bump libindicator to 0.3.22
revno: 384 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Wed 2011-03-23 13:26:14 -0500 message: Bump libindicator to 0.3.22 modified: configure.ac -- lp:indicator-applet https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet Your team ayatana-commits is subscribed to branch lp:indicator-applet. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet/+edit-subscription === modified file 'configure.ac' --- configure.ac 2011-02-17 20:53:36 + +++ configure.ac 2011-03-23 18:26:14 + @@ -26,7 +26,7 @@ ### GTK_REQUIRED_VERSION=2.12 -INDICATOR_REQUIRED_VERSION=0.3.19 +INDICATOR_REQUIRED_VERSION=0.3.22 PKG_CHECK_MODULES(APPLET, gtk+-2.0 = $GTK_REQUIRED_VERSION x11 ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-applet/applet] Rev 385: 0.4.10
revno: 385 tags: 0.4.10 committer: Ted Gould t...@gould.cx branch nick: trunk timestamp: Wed 2011-03-23 13:29:17 -0500 message: 0.4.10 modified: configure.ac -- lp:indicator-applet https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet Your team ayatana-commits is subscribed to branch lp:indicator-applet. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet/+edit-subscription === modified file 'configure.ac' --- configure.ac 2011-03-23 18:26:14 + +++ configure.ac 2011-03-23 18:29:17 + @@ -4,7 +4,7 @@ AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-applet, 0.4.9) +AM_INIT_AUTOMAKE(indicator-applet, 0.4.10) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Merge] lp:~mterry/indicator-datetime/sort-names-and-cleanup into lp:indicator-datetime
Michael Terry has proposed merging
lp:~mterry/indicator-datetime/sort-names-and-cleanup into lp:indicator-datetime.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
For more details, see:
https://code.launchpad.net/~mterry/indicator-datetime/sort-names-and-cleanup/+merge/54610
This branch does two things:
1) Sort location names (and puts any string that starts with the entered text
at the front)
2) Cleans up some uses of a more awkward api for tree models
--
https://code.launchpad.net/~mterry/indicator-datetime/sort-names-and-cleanup/+merge/54610
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.
=== modified file 'src/datetime-prefs-locations.c'
--- src/datetime-prefs-locations.c 2011-02-24 16:01:03 +
+++ src/datetime-prefs-locations.c 2011-03-23 21:08:29 +
@@ -35,6 +35,10 @@
#define DATETIME_DIALOG_UI_FILE PKGDATADIR /datetime-dialog.ui
+#define COL_NAME 0
+#define COL_TIME 1
+#define COL_ZONE 2
+
static void
handle_add (GtkWidget * button, GtkTreeView * tree)
{
@@ -84,7 +88,7 @@
GtkTreeIter iter;
if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (store), iter, path)) {
-gtk_list_store_set (store, iter, 0, new_text, -1);
+gtk_list_store_set (store, iter, COL_NAME, new_text, -1);
}
}
@@ -92,28 +96,28 @@
timezone_selected (GtkEntryCompletion * widget, GtkTreeModel * model,
GtkTreeIter * iter, gpointer user_data)
{
- GValue zone_value = {0}, name_value = {0};
const gchar * zone, * name;
- gtk_tree_model_get_value (model, iter, TIMEZONE_COMPLETION_ZONE, zone_value);
- zone = g_value_get_string (zone_value);
+ gtk_tree_model_get (model, iter,
+ TIMEZONE_COMPLETION_ZONE, zone,
+ TIMEZONE_COMPLETION_NAME, name,
+ -1);
- gtk_tree_model_get_value (model, iter, TIMEZONE_COMPLETION_NAME, name_value);
- name = g_value_get_string (name_value);
+ g_debug(match selected: %s, %s, name, zone);
if (zone == NULL || zone[0] == 0) {
-GValue lon_value = {0}, lat_value = {0};
const gchar * strlon, * strlat;
gdouble lon = 0.0, lat = 0.0;
-gtk_tree_model_get_value (model, iter, TIMEZONE_COMPLETION_LONGITUDE, lon_value);
-strlon = g_value_get_string (lon_value);
+gtk_tree_model_get (model, iter,
+TIMEZONE_COMPLETION_LONGITUDE, strlon,
+TIMEZONE_COMPLETION_LATITUDE, strlat,
+-1);
+
if (strlon != NULL strlon[0] != 0) {
lon = strtod(strlon, NULL);
}
-gtk_tree_model_get_value (model, iter, TIMEZONE_COMPLETION_LATITUDE, lat_value);
-strlat = g_value_get_string (lat_value);
if (strlat != NULL strlat[0] != 0) {
lat = strtod(strlat, NULL);
}
@@ -125,12 +129,9 @@
GtkListStore * store = GTK_LIST_STORE (g_object_get_data (G_OBJECT (widget), store));
GtkTreeIter * store_iter = (GtkTreeIter *)g_object_get_data (G_OBJECT (widget), store_iter);
if (store != NULL store_iter != NULL) {
-gtk_list_store_set (store, store_iter, 0, name, 2, zone, -1);
+gtk_list_store_set (store, store_iter, COL_NAME, name, COL_ZONE, zone, -1);
}
- g_value_unset (name_value);
- g_value_unset (zone_value);
-
return FALSE; // Do normal action too
}
@@ -169,11 +170,9 @@
GtkTreeIter iter;
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), iter)) {
do {
- GValue zone_value = {0};
const gchar * strzone;
- gtk_tree_model_get_value (GTK_TREE_MODEL (store), iter, 2, zone_value);
- strzone = g_value_get_string (zone_value);
+ gtk_tree_model_get (GTK_TREE_MODEL (store), iter, COL_ZONE, strzone, -1);
if (strzone != NULL strzone[0] != 0) {
GTimeZone * tz = g_time_zone_new (strzone);
@@ -181,15 +180,13 @@
gchar * format = generate_format_string_at_time (now_tz);
gchar * time_str = g_date_time_format (now_tz, format);
-gtk_list_store_set (store, iter, 1, time_str, -1);
+gtk_list_store_set (store, iter, COL_TIME, time_str, -1);
g_free (time_str);
g_free (format);
g_date_time_unref (now_tz);
g_time_zone_unref (tz);
}
-
- g_value_unset (zone_value);
} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), iter));
}
@@ -211,7 +208,7 @@
split_settings_location (*striter, zone, name);
gtk_list_store_append (GTK_LIST_STORE (store), iter);
-gtk_list_store_set (GTK_LIST_STORE (store), iter, 0, name, 2, zone, -1);
+gtk_list_store_set (GTK_LIST_STORE (store), iter, COL_NAME, name, COL_ZONE, zone, -1);
g_free (zone);
g_free (name);
@@ -234,23 +231,18 @@
GtkTreeIter iter;
if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), iter)) {
do {
- GValue zone_value = {0}, name_value = {0};
const gchar * strzone, * strname;
- gtk_tree_model_get_value (GTK_TREE_MODEL (store), iter, 0, name_value);
-
[Ayatana-commits] [Merge] lp:~cando/indicator-me/emesene2_support into lp:indicator-me
The proposal to merge lp:~cando/indicator-me/emesene2_support into lp:indicator-me has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~cando/indicator-me/emesene2_support/+merge/50178 -- https://code.launchpad.net/~cando/indicator-me/emesene2_support/+merge/50178 Your team ayatana-commits is subscribed to branch lp:indicator-me. ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
[Ayatana-commits] [Branch ~indicator-applet-developers/indicator-me/trunk] Rev 138: version bump 0.2.16
revno: 138 tags: 0.2.16 committer: Ken VanDine ken.vand...@canonical.com branch nick: indicator-me timestamp: Wed 2011-03-23 19:22:31 -0400 message: version bump 0.2.16 modified: configure.ac -- lp:indicator-me https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk Your team ayatana-commits is subscribed to branch lp:indicator-me. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-me/trunk/+edit-subscription === modified file 'configure.ac' --- configure.ac 2011-03-10 21:35:18 + +++ configure.ac 2011-03-23 23:22:31 + @@ -1,12 +1,12 @@ -AC_INIT(indicator-me, 0.2.15, david.ba...@canonical.com) +AC_INIT(indicator-me, 0.2.16, david.ba...@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-me, 0.2.15) +AM_INIT_AUTOMAKE(indicator-me, 0.2.16) AM_MAINTAINER_MODE ___ Mailing list: https://launchpad.net/~ayatana-commits Post to : ayatana-commits@lists.launchpad.net Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
