Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r2217 -
trunk/src/target/OM-2007/applications/openmoko-contacts/src
([EMAIL PROTECTED])
2. r2218 -
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src
([EMAIL PROTECTED])
3. r2219 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
4. r2220 -
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src
([EMAIL PROTECTED])
5. r2221 -
trunk/src/target/OM-2007/applications/openmoko-footer/src
([EMAIL PROTECTED])
6. r2222 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
7. r2223 -
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src
([EMAIL PROTECTED])
8. r2224 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
9. r2225 -
trunk/src/target/OM-2007/applications/openmoko-dialer/src
([EMAIL PROTECTED])
--- Begin Message ---
Author: njp
Date: 2007-06-12 12:54:40 +0200 (Tue, 12 Jun 2007)
New Revision: 2217
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
Log:
Check if entry returns NULL for its contact-uid property, before using it in
strcmp() and segfaulting
Modified:
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
2007-06-11 08:31:57 UTC (rev 2216)
+++
trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-history.c
2007-06-12 10:54:40 UTC (rev 2217)
@@ -497,7 +497,9 @@
MokoJournalEntry *entry = NULL;
if (moko_journal_get_entry_at (priv->journal, i, &entry)) {
- if (strcmp (priv->uid, moko_journal_entry_get_contact_uid (entry)) == 0)
{
+ const gchar *uid = moko_journal_entry_get_contact_uid (entry);
+
+ if (uid && strcmp (priv->uid, uid) == 0) {
children = g_list_append (children, entry);
}
}
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-06-12 13:10:19 +0200 (Tue, 12 Jun 2007)
New Revision: 2218
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
Log:
Call notify_entry_added on pre-existing entries as well as those that are new
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
2007-06-12 10:54:40 UTC (rev 2217)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
2007-06-12 11:10:19 UTC (rev 2218)
@@ -999,6 +999,7 @@
g_return_val_if_fail (a_entry, FALSE) ;
g_array_append_val (a_journal->entries, a_entry) ;
+
return TRUE ;
}
@@ -1313,6 +1314,8 @@
&offset))
{
/*we already have the component in memory, ignore it*/
+ if (entry)
+ notify_entry_added (a_journal, entry);
continue ;
}
/*****************
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 13:25:45 +0200 (Tue, 12 Jun 2007)
New Revision: 2219
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
Log:
openmoko-dialer: Remove hard coded widget sizes (bug 600)
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-06-12 11:10:19 UTC (rev 2218)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-06-12 11:25:45 UTC (rev 2219)
@@ -269,13 +269,6 @@
DBG_LEAVE ();
}
-
-
-
-
-
-#define WINDOW_DIALER_BUTTON_SIZE_X 100
-#define WINDOW_DIALER_BUTTON_SIZE_Y 100
gint
window_dialer_init (MokoDialerData * p_dialer_data)
{
@@ -375,7 +368,7 @@
//the buttons
- GtkWidget *vbox2 = gtk_vbox_new (FALSE, 0);
+ GtkWidget *vbox2 = gtk_vbox_new (FALSE, 10);
GtkWidget *button1 = moko_pixmap_button_new ();
g_signal_connect (G_OBJECT (button1), "clicked",
G_CALLBACK (cb_delete_button_clicked), p_dialer_data);
@@ -385,10 +378,8 @@
file_new_image_from_relative_path ("delete.png"));
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button1), "Delete");
- gtk_widget_set_size_request (button1, WINDOW_DIALER_BUTTON_SIZE_X,
- WINDOW_DIALER_BUTTON_SIZE_Y);
- gtk_box_pack_start (GTK_BOX (vbox2), button1, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox2), button1, FALSE, FALSE, 0);
GtkWidget *button3 = moko_pixmap_button_new ();
g_signal_connect (G_OBJECT (button3), "clicked",
@@ -399,9 +390,7 @@
file_new_image_from_relative_path ("history.png"));
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button3), "History");
- gtk_widget_set_size_request (button3, WINDOW_DIALER_BUTTON_SIZE_X,
- WINDOW_DIALER_BUTTON_SIZE_Y);
- gtk_box_pack_start (GTK_BOX (vbox2), button3, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox2), button3, FALSE, FALSE, 0);
GtkWidget *button2 = moko_pixmap_button_new ();
@@ -414,16 +403,12 @@
file_new_image_from_relative_path ("phone.png"));
moko_pixmap_button_set_action_btn_lower_label (MOKO_PIXMAP_BUTTON
(button2), "Dial");
- gtk_widget_set_size_request (button2, WINDOW_DIALER_BUTTON_SIZE_X + 20,
- WINDOW_DIALER_BUTTON_SIZE_Y + 80);
- gtk_box_pack_start (GTK_BOX (vbox2), button2, FALSE, FALSE, 20);
+ gtk_box_pack_start (GTK_BOX (vbox2), button2, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
-
-
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-06-12 11:10:19 UTC (rev 2218)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-06-12 11:25:45 UTC (rev 2219)
@@ -553,7 +553,6 @@
GtkWidget *eventboxTop = gtk_event_box_new ();
gtk_widget_show (eventboxTop);
gtk_box_pack_start (GTK_BOX (vbox), eventboxTop, FALSE, FALSE, 5);
- gtk_widget_set_size_request (eventboxTop, 480, 64);
gtk_widget_set_name (eventboxTop, "gtkeventbox-black");
GtkWidget *hbox67 = gtk_hbox_new (FALSE, 0);
@@ -574,7 +573,6 @@
GtkWidget *labelHistoryTitle = gtk_label_new (("History-"));
gtk_widget_show (labelHistoryTitle);
gtk_box_pack_start (GTK_BOX (hbox67), labelHistoryTitle, FALSE, FALSE, 0);
- gtk_widget_set_size_request (labelHistoryTitle, 221, -1);
gtk_label_set_justify (GTK_LABEL (labelHistoryTitle), GTK_JUSTIFY_RIGHT);
gtk_misc_set_alignment (GTK_MISC (labelHistoryTitle), 1, 0.5);
@@ -611,17 +609,13 @@
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeviewHistory), FALSE);
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeviewHistory), FALSE);
-// gtk_misc_set_alignment (GTK_MISC (treeviewHistory), 0.5, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
gtk_widget_set_name (treeviewHistory, "gtktreeview-black");
p_dialer_data->treeview_history = treeviewHistory;
history_build_history_list_view (p_dialer_data);
- gtk_widget_set_size_request (scrolledwindow, -1, 400);
-// gtk_misc_set_alignment (GTK_MISC (treeviewHistory),1,0.1);
-
g_signal_connect ((gpointer) treeviewHistory, "cursor_changed",
G_CALLBACK (on_treeviewHistory_cursor_changed),
p_dialer_data);
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-06-12 13:35:52 +0200 (Tue, 12 Jun 2007)
New Revision: 2220
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
Log:
Make sure entry variable is set to NULL for each iteration, to stop overwriting
other entries
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
2007-06-12 11:25:45 UTC (rev 2219)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-journal.c
2007-06-12 11:35:52 UTC (rev 2220)
@@ -1289,11 +1289,12 @@
{
icalcomponent *ical_comp = NULL ;
GList *cur_entry = NULL ;
- MokoJournalEntry *entry = NULL ;
int offset=0 ;
for (cur_entry = a_entries ; cur_entry ; cur_entry = cur_entry->next)
{
+ MokoJournalEntry *entry = NULL ;
+
/*****************
* <sanity checks>
*****************/
@@ -1337,8 +1338,7 @@
continue ;
}
moko_journal_add_entry (a_journal, entry) ;
- notify_entry_added (a_journal, entry);
- entry = NULL ;
+ notify_entry_added (a_journal, entry) ;
}
}
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 13:45:33 +0200 (Tue, 12 Jun 2007)
New Revision: 2221
Modified:
trunk/src/target/OM-2007/applications/openmoko-footer/src/Makefile.am
Log:
openmoko-footer: fix distcheck
Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/Makefile.am
2007-06-12 11:35:52 UTC (rev 2220)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/Makefile.am
2007-06-12 11:45:33 UTC (rev 2221)
@@ -6,7 +6,12 @@
bin_PROGRAMS = openmoko-footer
-openmoko_footer_SOURCES = main.c footer.c callbacks.c taskmanager.c taskitem.c
misc.c
+openmoko_footer_SOURCES = main.c main.h \
+ footer.c footer.h \
+ callbacks.c callbacks.h \
+ taskmanager.c taskmanager.h \
+ taskitem.c taskitem.h \
+ misc.c misc.h
openmoko_footer_LDADD = @OPENMOKO_LIBS@
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-06-12 15:00:39 +0200 (Tue, 12 Jun 2007)
New Revision: 2222
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
Log:
Update counter when a new entry is added
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-06-12 11:45:33 UTC (rev 2221)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-06-12 13:00:39 UTC (rev 2222)
@@ -1034,7 +1034,7 @@
g_return_if_fail (p_dialer_data);
g_print ("A new entry has been added\n");
-
+
/* We're not interested in anything other than voice entrys */
if (moko_journal_entry_get_type (j_entry) != VOICE_JOURNAL_ENTRY)
{
@@ -1044,6 +1044,5 @@
/* Get the list store*/
list_store = p_dialer_data->g_list_store;
history_add_entry (list_store, j_entry);
+ history_update_counter (p_dialer_data);
}
-
-
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-06-12 15:02:00 +0200 (Tue, 12 Jun 2007)
New Revision: 2223
Modified:
trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c
Log:
Swap icaltime_today () for icaltime_from_timet_with_zone (), as the former
does not keep the actual 'time', just the date.
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c
2007-06-12 13:00:39 UTC (rev 2222)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokojournal/src/moko-time.c
2007-06-12 13:02:00 UTC (rev 2223)
@@ -29,7 +29,7 @@
{
MokoTime *result ;
result = g_new0 (MokoTime, 1) ;
- result->t = icaltime_today () ;
+ result->t = icaltime_from_timet_with_zone (time (NULL), FALSE, NULL);
return result ;
}
--- End Message ---
--- Begin Message ---
Author: njp
Date: 2007-06-12 15:12:39 +0200 (Tue, 12 Jun 2007)
New Revision: 2224
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
Log:
Changed history label from 'History-' to 'Call History - ', bug #435
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-06-12 13:02:00 UTC (rev 2223)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-history.c
2007-06-12 13:12:39 UTC (rev 2224)
@@ -570,7 +570,7 @@
gtk_widget_show (imageLeftMenu);
gtk_container_add (GTK_CONTAINER (eventboxLeftTop), imageLeftMenu);
- GtkWidget *labelHistoryTitle = gtk_label_new (("History-"));
+ GtkWidget *labelHistoryTitle = gtk_label_new (("Call History - "));
gtk_widget_show (labelHistoryTitle);
gtk_box_pack_start (GTK_BOX (hbox67), labelHistoryTitle, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (labelHistoryTitle), GTK_JUSTIFY_RIGHT);
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2007-06-12 17:03:17 +0200 (Tue, 12 Jun 2007)
New Revision: 2225
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c
Log:
* openmoko-dialer: remove hardcoded font sizes from dialer buttons (bug 600)
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-06-12 13:12:39 UTC (rev 2224)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-dialer.c
2007-06-12 15:03:17 UTC (rev 2225)
@@ -352,9 +352,6 @@
GtkWidget *mokodialerpanel = moko_dialer_panel_new ();
- gtk_widget_set_size_request (mokodialerpanel, 380, 384);
-
-
g_signal_connect (GTK_OBJECT (mokodialerpanel), "user_input",
G_CALLBACK (on_dialer_panel_user_input), p_dialer_data);
@@ -407,7 +404,7 @@
gtk_box_pack_start (GTK_BOX (vbox2), button2, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c
2007-06-12 13:12:39 UTC (rev 2224)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-dialer-panel.c
2007-06-12 15:03:17 UTC (rev 2225)
@@ -138,7 +138,6 @@
G_CALLBACK (moko_dialer_panel_pressed),
moko_dialer_panel);
- gtk_widget_set_size_request (moko_dialer_panel->buttons[i][j], 20, 20);
gtk_widget_show (moko_dialer_panel->buttons[i][j]);
}
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c
2007-06-12 13:12:39 UTC (rev 2224)
+++
trunk/src/target/OM-2007/applications/openmoko-dialer/src/moko-digit-button.c
2007-06-12 15:03:17 UTC (rev 2225)
@@ -28,25 +28,21 @@
G_DEFINE_TYPE (MokoDigitButton, moko_digit_button, GTK_TYPE_BUTTON)
#define MOKO_DIGIT_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
MOKO_TYPE_DIGIT_BUTTON, MokoDigitButtonPrivate))
- struct _MokoDigitButtonPrivate
- {
+struct _MokoDigitButtonPrivate
+{
+ GtkWidget *labelDigit;
+ GtkWidget *labelAcrobat;
+ gchar leftclickdigit;
+ gchar rightclickdigit;
+};
- GtkWidget *labelDigit;
- GtkWidget *labelAcrobat;
- gchar leftclickdigit;
- gchar rightclickdigit;
- };
+typedef struct _MokoDigitButtonPrivate MokoDigitButtonPrivate;
-
- typedef struct _MokoDigitButtonPrivate MokoDigitButtonPrivate;
-
- GtkWidget *moko_digit_button_new ()
+GtkWidget
+*moko_digit_button_new ()
{
-
-//g_print("moko_digit_button_new\n");
-// return (GTK_WIDGET(g_object_new (MOKO_TYPE_DIGIT_BUTTON, NULL)));
return moko_digit_button_new_with_labels ("1", "ABC");
}
@@ -60,55 +56,42 @@
moko_digit_button_new_with_labels (const gchar * string_digit,
const gchar * string_acrobat)
{
-
- PangoFontDescription *font_desc_label = 0;
- font_desc_label = pango_font_description_new ();
+ gchar *str;
MokoDigitButton *digitbutton =
(MokoDigitButton *) g_object_new (MOKO_TYPE_DIGIT_BUTTON, NULL);
gtk_widget_show (GTK_WIDGET (digitbutton));
- gtk_widget_set_size_request (GTK_WIDGET (digitbutton), 64, 64);
GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (digitbutton), GTK_CAN_FOCUS);
-// GtkWidget * hbox = gtk_hbox_new (TRUE, 0);
- GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox);
- gtk_container_add (GTK_CONTAINER (digitbutton), hbox);
+ GtkWidget *alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_container_add (GTK_CONTAINER (digitbutton), alignment);
+ gtk_widget_show (alignment);
- GtkWidget *vbox = gtk_vbox_new (TRUE, 0);
- gtk_widget_show (vbox);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 15);
+ GtkWidget *hbox = gtk_vbox_new (FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (alignment), hbox);
- GtkWidget *labelDigit = gtk_label_new (string_digit);
- gtk_widget_show (labelDigit);
- gtk_box_pack_start (GTK_BOX (vbox), labelDigit, TRUE, TRUE, 0);
- GtkWidget *alignment = gtk_alignment_new (0, 1, 0, 0.3);
- gtk_widget_show (alignment);
- gtk_box_pack_start (GTK_BOX (hbox), alignment, TRUE, TRUE, 0);
+ GtkWidget *labelDigit = gtk_label_new (NULL);
+ str = g_markup_printf_escaped ("<span size=\"xx-large\">%s</span>",
string_digit);
+ gtk_label_set_markup (GTK_LABEL (labelDigit), str);
+ gtk_box_pack_start (GTK_BOX (hbox), labelDigit, TRUE, TRUE, 0);
+ g_free (str);
- GtkWidget *labelAcrobat = gtk_label_new (string_acrobat);
- gtk_widget_show (labelAcrobat);
- gtk_container_add (GTK_CONTAINER (alignment), labelAcrobat);
+ GtkWidget *labelAcrobat = gtk_label_new (NULL);
+ str = g_markup_printf_escaped ("<small>%s</small>", string_acrobat);
+ gtk_label_set_markup (GTK_LABEL (labelAcrobat), str);
+ g_free (str);
+ gtk_container_add (GTK_CONTAINER (hbox), labelAcrobat);
gtk_widget_set_name (GTK_WIDGET (digitbutton), "mokofingerbutton-dialer");
MokoDigitButtonPrivate *priv =
(MokoDigitButtonPrivate *) MOKO_DIGIT_BUTTON_GET_PRIVATE (digitbutton);
- //set the fonts of each side.
- pango_font_description_set_size (font_desc_label, 32 * PANGO_SCALE);
- if (font_desc_label)
- gtk_widget_modify_font (labelDigit, font_desc_label);
- pango_font_description_set_size (font_desc_label, 10 * PANGO_SCALE);
- if (font_desc_label)
- gtk_widget_modify_font (labelAcrobat, font_desc_label);
- if (font_desc_label)
- pango_font_description_free (font_desc_label);
-
priv->labelDigit = labelDigit;
priv->labelAcrobat = labelAcrobat;
+ gtk_widget_show_all (alignment);
return GTK_WIDGET (digitbutton);
@@ -125,19 +108,13 @@
priv->leftclickdigit = left;
priv->rightclickdigit = right;
-// g_print("moko_digit_button_set_numbers:%c,%d\n",left,right);
return TRUE;
}
static void
moko_digit_button_class_init (MokoDigitButtonClass * klass)
{
-//g_print("moko_digit_button_class_init\n");
-
-// GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
g_type_class_add_private (klass, sizeof (MokoDigitButtonPrivate));
-
return;
}
@@ -153,7 +130,6 @@
priv->labelAcrobat = 0;
priv->leftclickdigit = -1;
priv->rightclickdigit = -1;
-//g_print("moko_digit_button_init\n");
return;
}
@@ -161,45 +137,13 @@
moko_digit_button_get_left (MokoDigitButton * button)
{
MokoDigitButtonPrivate *priv = MOKO_DIGIT_BUTTON_GET_PRIVATE (button);
-// g_print("moko_digit_button_get_left:%c\n",priv->leftclickdigit);
return (priv->leftclickdigit);
-
}
gchar
moko_digit_button_get_right (MokoDigitButton * button)
{
MokoDigitButtonPrivate *priv = MOKO_DIGIT_BUTTON_GET_PRIVATE (button);
-// g_print("moko_digit_button_get_right:%c\n",priv->rightclickdigit);
return (priv->rightclickdigit);
-
}
-/*
-GType moko_digit_button_get_type(void)
-{
- static GType self_type = 0;
-
- if (!self_type)
- {
- static const GTypeInfo f_info =
- {
- sizeof (MokoDigitButtonClass),
- NULL, // base_init
- NULL, // base_finalize
- (GClassInitFunc) moko_digit_button_class_init,
- NULL, // class_finalize
- NULL, // class_data
- sizeof (MokoDigitButton),
- 0,
- (GInstanceInitFunc) moko_digit_button_init,
- };
-
- // add the type of your parent class here
- self_type = g_type_register_static(GTK_TYPE_BUTTON, "MokoDigitButton",
&f_info, 0);
- }
-
- return self_type;
-}
-
-*/
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
